[Bug 5420] New: rebase -b should calculate ancestors seperately

bugzilla at mercurial-scm.org bugzilla at mercurial-scm.org
Mon Nov 7 19:25:17 UTC 2016


https://bz.mercurial-scm.org/show_bug.cgi?id=5420

            Bug ID: 5420
           Summary: rebase -b should calculate ancestors seperately
           Product: Mercurial
           Version: default branch
          Hardware: All
                OS: All
            Status: UNCONFIRMED
          Severity: feature
          Priority: wish
         Component: rebase
          Assignee: bugzilla at selenic.com
          Reporter: arcppzju+hgbug at gmail.com
                CC: mercurial-devel at selenic.com

Given the following graph:

5
| 4
|/
3
| 2
|/
1

rebase -b 2+4 -d 5 will use the revset (ancestor(2+4)::(2+4) - ancestor(2+4))::
as the source, which is (1::(2+4) - 1)::, and it's finally 2+3+4+5.

So it may be better if we calculate ancestors for each revision -b specifies:
(ancestor(4,5):: - ancestor(4,5)):: + (ancestor(2,5):: - ancestor(2,5)):: and
that resolves to 2+4 as expected.

-- 
You are receiving this mail because:
You are on the CC list for the bug.


More information about the Mercurial-devel mailing list