Mercurial > hg

comparison tests/test-copies-chain-merge.t @ 46812:e4696ba43ecd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-copies: show some wrong ChangedFiles upgrade For file present only on one side and touched during merge, the upgrade code confused them as "merged". However they should be either "touched", or "salvaged" but they are currently recorded as "merged". See the next changesets for more details on these cases and fix. Differential Revision: https://phab.mercurial-scm.org/D10218
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 13 Mar 2021 04:54:05 +0100
parents 5a0b930cfb3e
children 316a768f2e43
comparison
equal deleted inserted replaced
46811:5a0b930cfb3e 46812:e4696ba43ecd
997 The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We 997 The "mAEm" and "mEAm" case create a rename tracking conflict on file 'f'. We
998 add more change on the respective branch and merge again. These second merge 998 add more change on the respective branch and merge again. These second merge
999 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA" 999 does not involve the file 'f' and the arbitration done within "mAEm" and "mEA"
1000 about that file should stay unchanged. 1000 about that file should stay unchanged.
1001 1001
1002 We also touch J during some of the merge to check for unrelated change to new file during merge.
1003
1002 $ case_desc="chained merges (conflict -> simple) - same content everywhere" 1004 $ case_desc="chained merges (conflict -> simple) - same content everywhere"
1003 1005
1004 (extra unrelated changes) 1006 (extra unrelated changes)
1005 1007
1006 $ hg up 'desc("a-2")' 1008 $ hg up 'desc("a-2")'
1046 $ hg up 'desc("mEAm")' 1048 $ hg up 'desc("mEAm")'
1047 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 1049 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1048 $ hg merge 'desc("j-1")' 1050 $ hg merge 'desc("j-1")'
1049 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1051 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1050 (branch merge, don't forget to commit) 1052 (branch merge, don't forget to commit)
1053 $ echo jj > unrelated-j
1051 $ hg ci -m "mEA,Jm: $case_desc" 1054 $ hg ci -m "mEA,Jm: $case_desc"
1052 1055
1053 (merge variant 4) 1056 (merge variant 4)
1054 1057
1055 $ hg up 'desc("j-1")' 1058 $ hg up 'desc("j-1")'
1056 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) 1059 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
1057 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) 1060 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
1058 $ hg merge 'desc("mEAm")' 1061 $ hg merge 'desc("mEAm")'
1059 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !) 1062 1 files updated, 0 files merged, 1 files removed, 0 files unresolved (no-changeset !)
1060 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !) 1063 0 files updated, 0 files merged, 1 files removed, 0 files unresolved (changeset !)
1061 (branch merge, don't forget to commit) 1064 (branch merge, don't forget to commit)
1065 $ echo jj > unrelated-j
1062 $ hg ci -m "mJ,EAm: $case_desc" 1066 $ hg ci -m "mJ,EAm: $case_desc"
1063 created new head 1067 created new head
1064 1068
1065 1069
1066 $ hg log -G --rev '::(desc("mAE,Km") + desc("mK,AEm") + desc("mEA,Jm") + desc("mJ,EAm"))' 1070 $ hg log -G --rev '::(desc("mAE,Km") + desc("mK,AEm") + desc("mEA,Jm") + desc("mJ,EAm"))'
1939 1 sidedata entries 1943 1 sidedata entries
1940 entry-0014 size 4 1944 entry-0014 size 4
1941 '\x00\x00\x00\x00' 1945 '\x00\x00\x00\x00'
1942 ##### revision "mEA,Jm" ##### 1946 ##### revision "mEA,Jm" #####
1943 1 sidedata entries 1947 1 sidedata entries
1944 entry-0014 size 4 1948 entry-0014 size 24
1945 '\x00\x00\x00\x00' 1949 '\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (no-upgraded no-upgraded-parallel !)
1950 touched : unrelated-j, ; (no-upgraded no-upgraded-parallel !)
1951 '\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded known-bad-output !)
1952 merged : unrelated-j, ; (upgraded known-bad-output !)
1953 '\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded-parallel known-bad-output !)
1954 merged : unrelated-j, ; (upgraded-parallel known-bad-output !)
1946 ##### revision "mJ,EAm" ##### 1955 ##### revision "mJ,EAm" #####
1947 1 sidedata entries 1956 1 sidedata entries
1948 entry-0014 size 4 1957 entry-0014 size 24
1949 '\x00\x00\x00\x00' 1958 '\x00\x00\x00\x01\x14\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (no-upgraded no-upgraded-parallel !)
1959 touched : unrelated-j, ; (no-upgraded no-upgraded-parallel !)
1960 '\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded known-bad-output !)
1961 merged : unrelated-j, ; (upgraded known-bad-output !)
1962 '\x00\x00\x00\x01\x08\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-j' (upgraded-parallel known-bad-output !)
1963 merged : unrelated-j, ; (upgraded-parallel known-bad-output !)
1950 ##### revision "s-1" ##### 1964 ##### revision "s-1" #####
1951 1 sidedata entries 1965 1 sidedata entries
1952 entry-0014 size 24 1966 entry-0014 size 24
1953 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-s' 1967 '\x00\x00\x00\x01\x04\x00\x00\x00\x0b\x00\x00\x00\x00unrelated-s'
1954 added : unrelated-s, ; 1968 added : unrelated-s, ;