Show More
@@ -999,6 +999,8 b' add more change on the respective branch' | |||||
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) | |
@@ -1048,17 +1050,19 b' about that file should stay unchanged.' | |||||
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 |
|
|
1059 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) | |
1057 |
|
|
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 |
$ |
|
1066 | $ hg ci -m "mJ,EAm: $case_desc" | |
1063 | created new head |
|
1067 | created new head | |
1064 |
|
1068 | |||
@@ -1941,12 +1945,22 b' We upgrade a repository that is not usin' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now