diff --git a/tests/test-copies-chain-merge.t b/tests/test-copies-chain-merge.t index d845b05e2209dffdf41090dc46b5dca26f55a596_dGVzdHMvdGVzdC1jb3BpZXMtY2hhaW4tbWVyZ2UudA==..0b58f8ae2f18a18e2a3d55c295c4904933fb2f3b_dGVzdHMvdGVzdC1jb3BpZXMtY2hhaW4tbWVyZ2UudA== 100644 --- a/tests/test-copies-chain-merge.t +++ b/tests/test-copies-chain-merge.t @@ -86,5 +86,6 @@ 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 @@ -90,3 +91,4 @@ $ 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 @@ -92,3 +94,3 @@ $ hg log -G - @ i-2: c -move-> d + @ i-2: c -move-> d, s -move-> t | @@ -94,5 +96,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -108,5 +110,5 @@ | o a-1: d -move-> e | - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -112,5 +114,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -125,5 +127,5 @@ $ hg log -G --rev '::.' @ b-1: b update | - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -129,5 +131,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -142,5 +144,5 @@ $ hg log -G --rev '::.' @ c-1 delete d | - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -146,5 +148,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -164,5 +166,5 @@ | o d-1 delete d | - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -168,5 +170,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -185,5 +187,5 @@ | o e-1 b -move-> g | - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -189,5 +191,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -230,5 +232,5 @@ | | o | a-1: d -move-> e |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -234,5 +236,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -280,5 +282,5 @@ | | o | b-1: b update |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -284,5 +286,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -320,5 +322,5 @@ | | o | b-1: b update |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -324,5 +326,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -368,5 +370,5 @@ | | o | a-1: d -move-> e |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -372,5 +374,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -423,5 +425,5 @@ | | o | b-1: b update |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -427,5 +429,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -475,5 +477,5 @@ | | o | d-1 delete d |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -479,5 +481,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -530,5 +532,5 @@ | | o | f-1: rename h -> i |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -534,5 +536,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -588,5 +590,5 @@ | | o | c-1 delete d |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -592,5 +594,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -637,5 +639,5 @@ | | o | b-1: b update |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -641,5 +643,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -664,10 +666,10 @@ 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")' @@ -668,8 +670,8 @@ $ 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")' @@ -675,5 +677,5 @@ $ 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 @@ -686,5 +688,5 @@ | | o | c-1 delete d | | - o | i-2: c -move-> d + o | i-2: c -move-> d, s -move-> t | | @@ -690,5 +692,5 @@ | | - o | i-1: a -move-> c + o | i-1: a -move-> c, p -move-> s |/ o i-0 initial commit: a b h @@ -740,5 +742,5 @@ | | o | a-1: d -move-> e |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -744,5 +746,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -847,5 +849,5 @@ | | o | a-1: d -move-> e |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -851,5 +853,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -930,5 +932,5 @@ | | | o b-1: b update |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -934,5 +936,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -1026,5 +1028,5 @@ | | o | f-1: rename h -> i |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -1030,5 +1032,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -1109,5 +1111,5 @@ | | o | a-1: d -move-> e |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -1113,5 +1115,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -1137,8 +1139,8 @@ g-1: update d h-1: b -(move)-> d i-0 initial commit: a b h - i-1: a -move-> c - i-2: c -move-> d + i-1: a -move-> c, p -move-> s + 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) @@ -1256,7 +1258,7 @@ added : r, ; ##### revision "i-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\x00ac' + entry-0014 size 44 + '\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; @@ -1261,4 +1263,6 @@ removed : a, ; added p1: c, a; + removed : p, ; + added p1: s, p; ##### revision "i-2" ##### 1 sidedata entries @@ -1263,6 +1267,6 @@ ##### revision "i-2" ##### 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\x00cd' + entry-0014 size 44 + '\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; @@ -1267,5 +1271,7 @@ removed : c, ; added p1: d, c; + removed : s, ; + added p1: t, s; ##### revision "a-1" ##### 1 sidedata entries entry-0014 size 24 @@ -1547,4 +1553,6 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' A f a + A t + p R a @@ -1550,4 +1558,5 @@ R a + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("a-2")' f A f a (no-changeset no-compatibility !) @@ -1569,5 +1578,5 @@ | | o | a-1: d -move-> e |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -1573,5 +1582,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -1602,4 +1611,6 @@ M b A f a + A t + p R a @@ -1605,5 +1616,6 @@ R a + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBAm")' M b A f a @@ -1606,5 +1618,7 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBAm")' M b A f a + A t + p R a @@ -1610,4 +1624,5 @@ R a + R p merging with the side having a delete ------------------------------------- @@ -1630,5 +1645,5 @@ | | o | b-1: b update |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -1634,5 +1649,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -1654,4 +1669,6 @@ R d $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-0")' M b + A t + p R a @@ -1657,3 +1674,4 @@ R a + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-0")' M b @@ -1658,3 +1676,5 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-0")' M b + A t + p R a @@ -1660,4 +1680,5 @@ R a + R p - comparing with the merge children re-adding the file @@ -1680,4 +1701,6 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBCm-1")' M b A d + A t + p R a @@ -1683,4 +1706,5 @@ R a + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-1")' M b A d @@ -1684,4 +1708,6 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCBm-1")' M b A d + A t + p R a @@ -1687,4 +1713,5 @@ R a + R p Comparing with a merge re-adding the file afterward --------------------------------------------------- @@ -1704,5 +1731,5 @@ | | o | b-1: b update |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -1708,5 +1735,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -1760,4 +1787,6 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBDm-0")' M b A d + A t + p R a @@ -1763,4 +1792,5 @@ R a + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")' M b A d @@ -1764,4 +1794,6 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDBm-0")' M b A d + A t + p R a @@ -1767,4 +1799,5 @@ R a + R p Comparing with a merge with colliding rename @@ -1789,5 +1822,5 @@ | | o | a-1: d -move-> e |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -1793,5 +1826,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -1881,5 +1914,7 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAEm-0")' A f a + A t + p R a R b @@ -1884,6 +1919,7 @@ R a R b + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm-0")' A f a (filelog !) b (no-filelog !) @@ -1886,6 +1922,8 @@ $ 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 @@ -1890,5 +1928,6 @@ R a R b + R p Subcase: existing copy information overwritten on one branch @@ -1914,5 +1953,5 @@ | | o | b-1: b update |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -1918,5 +1957,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -1924,5 +1963,7 @@ M b A d h + A t + p R a R h @@ -1927,6 +1968,7 @@ R a R h + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")' M b A d h @@ -1929,6 +1971,8 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mFBm-0")' M b A d h + A t + p R a R h @@ -1933,5 +1977,6 @@ 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 !) @@ -1966,7 +2011,7 @@ #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 @@ -1982,7 +2027,7 @@ #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 @@ -2008,5 +2053,5 @@ | | o | d-1 delete d |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -2012,5 +2057,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -2023,4 +2068,6 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mDGm-0")' A d a (filelog !) + A t + p R a @@ -2026,4 +2073,5 @@ R a + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGDm-0")' A d a @@ -2027,4 +2075,6 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGDm-0")' A d a + A t + p R a @@ -2030,4 +2080,5 @@ 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")' @@ -2045,5 +2096,5 @@ | | o | d-2 re-add d |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -2049,5 +2100,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -2060,7 +2111,7 @@ | | o | d-2 re-add d |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | ~ #endif @@ -2074,5 +2125,5 @@ | | o | d-2 re-add d |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -2078,5 +2129,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -2089,7 +2140,7 @@ | | o | d-2 re-add d |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | ~ #endif @@ -2116,5 +2167,5 @@ | | o | f-1: rename h -> i |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -2120,5 +2171,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -2153,5 +2204,7 @@ A d h (no-filelog !) a (filelog !) + A t + p R a R h @@ -2156,6 +2209,7 @@ R a R h + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGFm-0")' A d a (no-changeset !) h (changeset !) @@ -2158,6 +2212,8 @@ $ 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 @@ -2162,5 +2218,6 @@ 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")' @@ -2192,5 +2249,5 @@ | | o | f-1: rename h -> i |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -2196,5 +2253,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -2203,7 +2260,7 @@ $ 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 @@ -2218,5 +2275,5 @@ | | o | f-1: rename h -> i |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -2222,5 +2279,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -2229,7 +2286,7 @@ $ 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 @@ -2255,5 +2312,5 @@ | | o | c-1 delete d |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -2259,5 +2316,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -2267,4 +2324,6 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCGm-0")' A d a (no-compatibility no-changeset !) + A t + p R a @@ -2270,4 +2329,5 @@ R a + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGCm-0")' A d a (no-compatibility no-changeset !) @@ -2271,4 +2331,6 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGCm-0")' A d a (no-compatibility no-changeset !) + A t + p R a @@ -2274,4 +2336,5 @@ 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")' @@ -2300,5 +2363,5 @@ | | o | b-1: b update |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -2304,5 +2367,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -2313,4 +2376,6 @@ M b A d a (no-compatibility no-changeset !) + A t + p R a @@ -2316,5 +2381,6 @@ 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 !) @@ -2317,5 +2383,7 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")' M b A d a (no-compatibility no-changeset !) + A t + p R a @@ -2321,4 +2389,5 @@ R a + R p $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCB-revert-m-0")' M b A d @@ -2346,5 +2415,5 @@ | | o | c-1 delete d | | - o | i-2: c -move-> d + o | i-2: c -move-> d, s -move-> t | | @@ -2350,5 +2419,5 @@ | | - o | i-1: a -move-> c + o | i-1: a -move-> c, p -move-> s |/ o i-0 initial commit: a b h @@ -2356,5 +2425,7 @@ $ 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 @@ -2359,5 +2430,6 @@ R a R b + R p $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mHC-delete-before-conflict-m")' A d b @@ -2361,5 +2433,7 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mHC-delete-before-conflict-m")' A d b + A t + p R a R b @@ -2364,5 +2438,6 @@ R a R b + R p $ hg status --copies --rev 'desc("c-1")' --rev 'desc("mCH-delete-before-conflict-m")' A d b @@ -2372,4 +2447,6 @@ b R b $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mCH-delete-before-conflict-m")' + A t + p R a @@ -2375,2 +2452,3 @@ R a + R p $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mHC-delete-before-conflict-m")' @@ -2376,2 +2454,4 @@ $ hg status --copies --rev 'desc("h-1")' --rev 'desc("mHC-delete-before-conflict-m")' + A t + p R a @@ -2377,4 +2457,5 @@ R a + R p Variant of previous with extra changes introduced by the merge -------------------------------------------------------------- @@ -2401,5 +2482,5 @@ | | o | a-1: d -move-> e |/ - o i-2: c -move-> d + o i-2: c -move-> d, s -move-> t | @@ -2405,5 +2486,5 @@ | - o i-1: a -move-> c + o i-1: a -move-> c, p -move-> s | o i-0 initial commit: a b h @@ -2493,5 +2574,7 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mAE-change-m-0")' A f a + A t + p R a R b @@ -2496,6 +2579,7 @@ 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 !) @@ -2498,6 +2582,8 @@ $ 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 @@ -2502,5 +2588,6 @@ R a R b + R p Decision from previous merge are properly chained with later merge @@ -2575,4 +2662,6 @@ a (filelog !) a (sidedata !) a (upgraded !) + A t + p R a @@ -2578,7 +2667,8 @@ 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 !) @@ -2579,7 +2669,9 @@ $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")' M b A d a (filelog !) a (sidedata !) a (upgraded !) + A t + p R a @@ -2585,4 +2677,5 @@ R a + R p chained output @@ -2592,5 +2685,7 @@ a (filelog !) a (missing-correct-output sidedata !) a (missing-correct-output upgraded !) + A t + p A unrelated-l R a @@ -2595,8 +2690,9 @@ 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 !) @@ -2597,8 +2693,10 @@ $ 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 @@ -2603,8 +2701,9 @@ 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 !) @@ -2605,8 +2704,10 @@ $ 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 @@ -2611,8 +2712,9 @@ 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 !) @@ -2613,8 +2715,10 @@ $ 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 @@ -2619,5 +2723,6 @@ A unrelated-l R a + R p Subcase: chaining "merged" information during a merge ``````````````````````````````````````````````````````