[Bug 4035] New: move/rename on branch, merge branch to default, hg status -C does not show source of move

[mercurial-bugs at selenic.com]

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

          Priority: normal
            Bug ID: 4035
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: move/rename on branch, merge branch to default, hg
                    status -C does not show source of move
          Severity: bug
    Classification: Unclassified
                OS: Linux
          Reporter: stylpe at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: 2.7
         Component: Mercurial
           Product: Mercurial

After merging but before committing a merge from a branch that had files
moved/renamed, hg status -C does not show the moved files as expected, but
instead as a modify and delete. After committing the merge, running hg status
-C --change [rev] gives the normal expected output of a move with source and a
delete.

Steps to reproduce:

hg init .
hg ci -m init
touch a
hg add a
hg ci -m add-a
hg branch B
hg mv a b
hg ci -m move-a-b
hg up default
hg merge B
hg st # Shows as modification and removal
hg ci -m merge-B
hg st -C --change 2 # Shows as add with source and remove, as expected

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