[Bug 3822] New: graft: file moves sometimes changed to deletion+addition

mercurial-bugs at selenic.com mercurial-bugs at selenic.com
Wed Feb 13 06:40:40 CST 2013


          Priority: normal
            Bug ID: 3822
                CC: mercurial-devel at selenic.com
          Assignee: bugzilla at selenic.com
           Summary: graft: file moves sometimes changed to
          Severity: bug
    Classification: Unclassified
                OS: Windows
          Reporter: tosobody at gmail.com
          Hardware: PC
            Status: UNCONFIRMED
           Version: earlier
         Component: Mercurial
           Product: Mercurial

Mercurial version: 2.1.1


1. In several changesets I moved and renamed several files. Some of the files
were also changed.

2. These changesets (among others) were grafted from default to three branches
(all branched from default). In all three cases the grafted changesets were the
same ones in the same sequence.


The same move/rename in the same changeset grafted ok in some cases, and
transformed to deletion+addition in other cases.


There seems to be only one possible correlation (but no guaranty, I did not
check every case):
The move/rename might be changed to a deletion+addition for that file and that
graft, where no merge conflict appeared.

There is no correlation with:
* The changesets
* The files
* The file locations
* The branches grafted to
* Being the only change in a changeset or other changes, too
* Being the only move in a changeset or other moves, too
* Being move+change or only move
* move or rename
* move in a move chain or not
* type of graft:
   The graft to oldest branch was with:
    hg graft 72464 72467 72468 ... 73396::73411 73421::73423
   The graft to the middle one with (same changsets, but global ID, no ::):
    hg graft -D f39...dcc 5da...613 ... d24...e83 af1...ebc
   The graft to the newest branch (as above, without -D):
    hg graft f39...dcc 5da...613 ... d24...e83 af1...ebc
* ... several other things I checked, but forgot

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

More information about the Mercurial-devel mailing list