Find common ancestor in changeset view

Issue #289 resolved
joberschweiber created an issue

Right now the changeset view fails with a 500 error if you compare two branches, one of which has advanced beyond the last common ancestor.

This version of changeset.py fixes that for me (can't send a pull request as there are a bunch of other changes in that branch):

https://bitbucket.org/joberschweiber/rhodecode/changeset/a58742b773cb

It pretty much just does a brute force search for the newest common ancestor of both revs.

Comments (3)

  1. Marcin Kuzminski repo owner

    I'm not sure if this should be in vcs, can you make a repo, or a link that gives the error ?

  2. Marcin Kuzminski repo owner

    It was really a VCS issue. such compare should raise an exception since the changesets/rev..rev is not a COMPARE view, it's a list of combined changeset. Proper response should be a message displayed.

    " start revision 'default' cannot be after end revision 'test-branch' "

    It's now fixed in tip of vcs.

    and test-branch...default should work.

  3. Log in to comment