mercurial: comparison tests/test-copies-chain-merge.t

equal deleted inserted replaced

-:46205a478a08
+:0ebfd02dafd5
 adding h
 adding p
 adding q
 adding r
 $ hg mv a c
-$ hg ci -Am 'i-1: a -move-> c'
+$ hg mv p s
+$ hg ci -Am 'i-1: a -move-> c, p -move-> s'
 $ hg mv c d
-$ hg ci -Am 'i-2: c -move-> d'
+$ hg mv s t
+$ hg ci -Am 'i-2: c -move-> d, s -move-> t'
 $ hg log -G
-@  i-2: c -move-> d
+@  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 And having another branch with renames on the other side
 $ hg log -G --rev '::.'
 @  a-2: e -move-> f
 |
 o  a-1: d -move-> e
 |
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Have a branching with nothing on one side
 $ hg ci -m 'b-1: b update'
 created new head
 $ hg log -G --rev '::.'
 @  b-1: b update
 |
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Create a branch that delete a file previous renamed
 $ hg ci -m 'c-1 delete d'
 created new head
 $ hg log -G --rev '::.'
 @  c-1 delete d
 |
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Create a branch that delete a file previous renamed and recreate it
 $ hg log -G --rev '::.'
 @  d-2 re-add d
 |
 o  d-1 delete d
 |
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Having another branch renaming a different file to the same filename as another
 $ hg log -G --rev '::.'
 @  e-2 g -move-> f
 |
 o  e-1 b -move-> g
 |
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Setup all merge
 | |
 o |  a-2: e -move-> f
 | |
 o |  a-1: d -move-> e
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 | |/
 | o  c-1 delete d
 | |
 o |  b-1: b update
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Comparing with a merge re-adding the file afterward
 | |
 | o  d-1 delete d
 | |
 o |  b-1: b update
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 | |
 o |  a-2: e -move-> f
 | |
 o |  a-1: d -move-> e
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Subcase: existing copy information overwritten on one branch
 | |
 | o  f-1: rename h -> i
 | |
 o |  b-1: b update
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 | |
 o |  d-2 re-add d
 | |
 o |  d-1 delete d
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Subcase: merging a change to a file with a "copy overwrite" to that file from another branch
 | |
 o |  f-2: rename i -> d
 | |
 o |  f-1: rename h -> i
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 | |/
 | o  g-1: update d
 | |
 o |  c-1 delete d
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 | |/
 | o  c-1 delete d
 | |
 o |  b-1: b update
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 $ hg mv b d
 $ hg ci -m "h-1: b -(move)-> d"
 created new head
 $ hg up 'desc("c-1")'
-1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+2 files updated, 0 files merged, 3 files removed, 0 files unresolved
 $ hg merge 'desc("h-1")'
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 $ hg ci -m "mCH-delete-before-conflict-m-0 $case_desc - one way"
 $ hg up 'desc("h-1")'
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 $ hg merge 'desc("c-1")'
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 $ hg ci -m "mHC-delete-before-conflict-m-0 $case_desc - the other way"
 created new head
 $ hg log -G --rev '::(desc("mCH-delete-before-conflict-m")+desc("mHC-delete-before-conflict-m"))'
 @    mHC-delete-before-conflict-m-0 simple merge - C side: d is the results of renames then deleted, H side: d is result of another rename (same content as the other branch) - the other way
 | |/
 | o  h-1: b -(move)-> d
 | |
 o |  c-1 delete d
 | |
-o |  i-2: c -move-> d
+o |  i-2: c -move-> d, s -move-> t
 | |
-o |  i-1: a -move-> c
+o |  i-1: a -move-> c, p -move-> s
 |/
 o  i-0 initial commit: a b h
 Variant of previous with extra changes introduced by the merge
 | |
 o |  a-2: e -move-> f
 | |
 o |  a-1: d -move-> e
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Decision from previous merge are properly chained with later merge
 | |
 o |  a-2: e -move-> f
 | |
 o |  a-1: d -move-> e
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Subcase: chaining salvage information during a merge
 |/ /
 o |  c-1 delete d
 | |
 | o  b-1: b update
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 | |
 o |  f-2: rename i -> d
 | |
 o |  f-1: rename h -> i
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Subcase: chaining conflicting rename resolution, with extra change during the merge
 | |
 o |  a-2: e -move-> f
 | |
 o |  a-1: d -move-> e
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Summary of all created cases
 f-1: rename h -> i
 f-2: rename i -> d
 g-1: update d
 h-1: b -(move)-> d
 i-0 initial commit: a b h
-i-1: a -move-> c
+i-1: a -move-> c, p -move-> s
-i-2: c -move-> d
+i-2: c -move-> d, s -move-> t
 j-1: unrelated changes (based on the "a" series of changes)
 k-1: unrelated changes (based on "e" changes)
 l-1: unrelated changes (based on "c" changes)
 mABm-0 simple merge - A side: multiple renames, B side: unrelated update - the other way
 mAE,Km: chained merges (conflict -> simple) - same content everywhere
 added      : p, ;
 added      : q, ;
 added      : r, ;
 ##### revision "i-1" #####
 1 sidedata entries
-entry-0014 size 24
+entry-0014 size 44
-'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00ac'
+'\x00\x00\x00\x04\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00\x0c\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x02acps'
 removed    : a, ;
 added    p1: c, a;
+removed    : p, ;
+added    p1: s, p;
 ##### revision "i-2" #####
 1 sidedata entries
-entry-0014 size 24
+entry-0014 size 44
-'\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00cd'
+'\x00\x00\x00\x04\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00\x0c\x00\x00\x00\x03\x00\x00\x00\x00\x06\x00\x00\x00\x04\x00\x00\x00\x02cdst'
 removed    : c, ;
 added    p1: d, c;
+removed    : s, ;
+added    p1: t, s;
 ##### revision "a-1" #####
 1 sidedata entries
 entry-0014 size 24
 '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00de'
 removed    : d, ;
 The two status call should give the same value for f
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")'
 A f
 a
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' f
 A f
 a (no-changeset no-compatibility !)
 merging with unrelated change does not interfere with the renames
 | |
 o |  a-2: e -move-> f
 | |
 o |  a-1: d -move-> e
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mABm")'
 R d
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mABm")'
 M b
 A f
 a
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBAm")'
 M b
 A f
 a
-R a
+A t
+p
+R a
+R p
 merging with the side having a delete
 -------------------------------------
 case summary:
 | |/
 | o  c-1 delete d
 | |
 o |  b-1: b update
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 - comparing from the merge
 $ hg status --copies --rev 'desc("i-2")' --rev 'desc("mCBm-0")'
 M b
 R d
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-0")'
 M b
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-0")'
 M b
-R a
+A t
+p
+R a
+R p
 - comparing with the merge children re-adding the file
 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBCm-1")'
 M d
 M b
 M d
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-1")'
 M b
 A d
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-1")'
 M b
 A d
-R a
+A t
+p
+R a
+R p
 Comparing with a merge re-adding the file afterward
 ---------------------------------------------------
 Merge:
 | |
 | o  d-1 delete d
 | |
 o |  b-1: b update
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBDm-0")'
 M d
 ~
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")'
 M b
 A d
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")'
 M b
 A d
-R a
+A t
+p
+R a
+R p
 Comparing with a merge with colliding rename
 --------------------------------------------
 | |
 o |  a-2: e -move-> f
 | |
 o |  a-1: d -move-> e
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 #if no-changeset
 $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644   f'
 R b
 R d
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAEm-0")'
 A f
 a
+A t
+p
 R a
 R b
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm-0")'
 A f
 a (filelog !)
 b (no-filelog !)
+A t
+p
 R a
 R b
+R p
 Subcase: existing copy information overwritten on one branch
 ````````````````````````````````````````````````````````````
 | |
 | o  f-1: rename h -> i
 | |
 o |  b-1: b update
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBFm-0")'
 M b
 A d
 h
+A t
+p
 R a
 R h
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")'
 M b
 A d
 h
+A t
+p
 R a
 R h
+R p
 $ hg status --copies --rev 'desc("b-1")' --rev 'desc("mBFm-0")'
 M d (no-changeset !)
 h (no-filelog no-changeset !)
 R h
 $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mBFm-0")'
 o  i-0 initial commit: a b h
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
 $ hg log -Gfr 'desc("mBFm-0")' d
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
 ~
 #endif
 #if no-changeset
 o  i-0 initial commit: a b h
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
 $ hg log -Gfr 'desc("mFBm-0")' d
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
 ~
 #endif
 Subcase: reset of the copy history on one side
 | |
 o |  d-2 re-add d
 | |
 o |  d-1 delete d
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 One side of the merge have a long history with rename. The other side of the
 merge point to a new file with a smaller history. Each side is "valid".
 revision numbers)
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")'
 A d
 a (filelog !)
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGDm-0")'
 A d
 a
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mDGm-0")'
 M d
 $ hg status --copies --rev 'desc("d-2")' --rev 'desc("mGDm-0")'
 M d
 $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mDGm-0")'
 |\
 | o  g-1: update d
 | |
 o |  d-2 re-add d
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
 |\
 | o  g-1: update d
 | |
 o |  d-2 re-add d
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
 ~
 #endif
 |\
 | o  g-1: update d
 | |
 o |  d-2 re-add d
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
 |\
 | o  g-1: update d
 | |
 o |  d-2 re-add d
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
 ~
 #endif
 Subcase: merging a change to a file with a "copy overwrite" to that file from another branch
 | |
 o |  f-2: rename i -> d
 | |
 o |  f-1: rename h -> i
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 Note:
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFGm-0")'
 A d
 h (no-filelog !)
 a (filelog !)
+A t
+p
 R a
 R h
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm-0")'
 A d
 a (no-changeset !)
 h (changeset !)
+A t
+p
 R a
 R h
+R p
 $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mFGm-0")'
 M d
 $ hg status --copies --rev 'desc("f-2")' --rev 'desc("mGFm-0")'
 M d
 $ hg status --copies --rev 'desc("f-1")' --rev 'desc("mFGm-0")'
 | |
 o |  f-2: rename i -> d
 | |
 o |  f-1: rename h -> i
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
 $ hg log -Gfr 'desc("mFGm-0")' d
 o  g-1: update d
 |
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
 ~
 #endif
 #if no-changeset
 | |
 o |  f-2: rename i -> d
 | |
 o |  f-1: rename h -> i
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 #else
 BROKEN: `hg log --follow <file>` relies on filelog metadata to work
 $ hg log -Gfr 'desc("mGFm-0")' d
 o  g-1: update d
 |
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
 ~
 #endif
 | |/
 | o  g-1: update d
 | |
 o |  c-1 delete d
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 'a' is the copy source of 'd'
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")'
 A d
 a (no-compatibility no-changeset !)
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGCm-0")'
 A d
 a (no-compatibility no-changeset !)
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCGm-0")'
 A d
 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mGCm-0")'
 A d
 $ hg status --copies --rev 'desc("g-1")' --rev 'desc("mCGm-0")'
 | |/
 | o  c-1 delete d
 | |
 o |  b-1: b update
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 'a' is the the copy source of 'd'
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")'
 M b
 A d
 a (no-compatibility no-changeset !)
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")'
 M b
 A d
 a (no-compatibility no-changeset !)
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")'
 M b
 A d
 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mBC-revert-m-0")'
 M b
 | |/
 | o  h-1: b -(move)-> d
 | |
 o |  c-1 delete d
 | |
-o |  i-2: c -move-> d
+o |  i-2: c -move-> d, s -move-> t
 | |
-o |  i-1: a -move-> c
+o |  i-1: a -move-> c, p -move-> s
 |/
 o  i-0 initial commit: a b h
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCH-delete-before-conflict-m")'
 A d
 b (no-compatibility no-changeset !)
+A t
+p
 R a
 R b
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mHC-delete-before-conflict-m")'
 A d
 b
+A t
+p
 R a
 R b
+R p
 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCH-delete-before-conflict-m")'
 A d
 b
 R b
 $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mHC-delete-before-conflict-m")'
 A d
 b
 R b
 $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mCH-delete-before-conflict-m")'
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mHC-delete-before-conflict-m")'
-R a
+A t
+p
+R a
+R p
 Variant of previous with extra changes introduced by the merge
 --------------------------------------------------------------
 (see case declaration for details)
 | |
 o |  a-2: e -move-> f
 | |
 o |  a-1: d -move-> e
 |/
-o  i-2: c -move-> d
+o  i-2: c -move-> d, s -move-> t
 |
-o  i-1: a -move-> c
+o  i-1: a -move-> c, p -move-> s
 |
 o  i-0 initial commit: a b h
 #if no-changeset
 $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644   f'
 R b
 R d
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change-m-0")'
 A f
 a
+A t
+p
 R a
 R b
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change-m-0")'
 A f
 a (filelog !)
 b (no-filelog !)
+A t
+p
 R a
 R b
+R p
 Decision from previous merge are properly chained with later merge
 ------------------------------------------------------------------
 M b
 A d
 a (filelog !)
 a (sidedata !)
 a (upgraded !)
-R a
+A t
+p
+R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")'
 M b
 A d
 a (filelog !)
 a (sidedata !)
 a (upgraded !)
-R a
+A t
+p
+R a
+R p
 chained output
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC+revert,Lm")'
 M b
 A d
 a (filelog !)
 a (missing-correct-output sidedata !)
 a (missing-correct-output upgraded !)
+A t
+p
 A unrelated-l
 R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB+revert,Lm")'
 M b
 A d
 a (filelog !)
 a (missing-correct-output sidedata !)
 a (missing-correct-output upgraded !)
+A t
+p
 A unrelated-l
 R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,BC+revertm")'
 M b
 A d
 a (filelog !)
 a (missing-correct-output sidedata !)
 a (missing-correct-output upgraded !)
+A t
+p
 A unrelated-l
 R a
+R p
 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,CB+revertm")'
 M b
 A d
 a (filelog !)
 a (missing-correct-output sidedata !)
 a (missing-correct-output upgraded !)
+A t
+p
 A unrelated-l
 R a
+R p
 Subcase: chaining "merged" information during a merge
 ``````````````````````````````````````````````````````
 When a non-rename change are merged with a copy overwrite, the merge pick the copy source from (p1) as the reference. We should preserve this information in subsequent merges.

changeset 46556	0ebfd02dafd5
parent 46555	46205a478a08
child 46557	067307d6589d