[Bug 4080] New: rebase --keep --collapse leaves working copy on wrong commit

[mercurial-bugs at selenic.com]

http://bz.selenic.com/show_bug.cgi?id=4080

          Priority: normal
            Bug ID: 4080
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: rebase --keep --collapse leaves working copy on wrong
                    commit
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: durham at fb.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.8
         Component: rebase
           Product: Mercurial

As of 2.8 rebase -d @ -r foo --keep --collapse leaves the working copy on @
instead of on the new foo. This worked prior to 2.8.

hg init foo
cd foo
touch a && hg ci -Aqm a
hg book @
hg book foo
touch b && hg ci -Aqm b
hg rebase -d @ -r foo --keep --collapse -m "collapsed"
hg log -G --template "{rev} {desc}"

o  2 collapsed
|
| o  1 b
|/
@  0 a

Expected: Working copy is on rev 2
Actual: Working copy is on rev 0

This breaks some of our internal tools that automate rebases.

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