[Bug 4055] New: shelve after rebase corrupts dirstate

[mercurial-bugs at selenic.com]

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

          Priority: normal
            Bug ID: 4055
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: shelve after rebase corrupts dirstate
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: durham at fb.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.7.2
         Component: Mercurial
           Product: Mercurial

Shelving some changes on a feature branch, then rebasing that feature branch
and unshelving, results in hg status showing files that aren't actually
modified.

> hg init foo && cd foo
> echo -e 'x\ny' > x
> echo z > z
> hg commit -Aqm xy
> echo z >> x
> hg commit -Aqm z
> hg up 0
> echo -e 'a\nx\ny\nz' > x
> hg commit -Aqm xyz
> echo c >> z
> hg shelve
> hg rebase -d 1
> hg unshelve
> hg status
M x
M z
> hg debugrebuilddirstate
> hg status
M z

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