Show More
@@ -193,6 +193,29 b' Having another branch renaming a differe' | |||||
193 | | |
|
193 | | | |
194 | o i-0 initial commit: a b h |
|
194 | o i-0 initial commit: a b h | |
195 |
|
195 | |||
|
196 | $ hg up -q null | |||
|
197 | ||||
|
198 | Having a branch similar to the 'a' one, but moving the 'p' file around. | |||
|
199 | ||||
|
200 | $ hg up 'desc("i-2")' | |||
|
201 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
202 | $ hg mv t u | |||
|
203 | $ hg ci -Am 'p-1: t -move-> u' | |||
|
204 | created new head | |||
|
205 | $ hg mv u v | |||
|
206 | $ hg ci -Am 'p-2: u -move-> v' | |||
|
207 | $ hg log -G --rev '::.' | |||
|
208 | @ p-2: u -move-> v | |||
|
209 | | | |||
|
210 | o p-1: t -move-> u | |||
|
211 | | | |||
|
212 | o i-2: c -move-> d, s -move-> t | |||
|
213 | | | |||
|
214 | o i-1: a -move-> c, p -move-> s | |||
|
215 | | | |||
|
216 | o i-0 initial commit: a b h | |||
|
217 | ||||
|
218 | $ hg up -q null | |||
196 |
|
219 | |||
197 | Setup all merge |
|
220 | Setup all merge | |
198 | =============== |
|
221 | =============== | |
@@ -209,7 +232,7 b' merging with unrelated change does not i' | |||||
209 | $ case_desc="simple merge - A side: multiple renames, B side: unrelated update" |
|
232 | $ case_desc="simple merge - A side: multiple renames, B side: unrelated update" | |
210 |
|
233 | |||
211 | $ hg up 'desc("b-1")' |
|
234 | $ hg up 'desc("b-1")' | |
212 |
|
|
235 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
213 | $ hg merge 'desc("a-2")' |
|
236 | $ hg merge 'desc("a-2")' | |
214 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
237 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
215 | (branch merge, don't forget to commit) |
|
238 | (branch merge, don't forget to commit) | |
@@ -1186,6 +1209,8 b' Summary of all created cases' | |||||
1186 | mO,FGm: chained merges (copy-overwrite -> simple) - same content |
|
1209 | mO,FGm: chained merges (copy-overwrite -> simple) - same content | |
1187 | n-1: unrelated changes (based on the "f" series of changes) |
|
1210 | n-1: unrelated changes (based on the "f" series of changes) | |
1188 | o-1: unrelated changes (based on "g" changes) |
|
1211 | o-1: unrelated changes (based on "g" changes) | |
|
1212 | p-1: t -move-> u | |||
|
1213 | p-2: u -move-> v | |||
1189 |
|
1214 | |||
1190 |
|
1215 | |||
1191 | Test that sidedata computations during upgrades are correct |
|
1216 | Test that sidedata computations during upgrades are correct | |
@@ -1316,6 +1341,18 b' We upgrade a repository that is not usin' | |||||
1316 | '\x00\x00\x00\x02\x06\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00fg' |
|
1341 | '\x00\x00\x00\x02\x06\x00\x00\x00\x01\x00\x00\x00\x01\x0c\x00\x00\x00\x02\x00\x00\x00\x00fg' | |
1317 | added p1: f, g; |
|
1342 | added p1: f, g; | |
1318 | removed : g, ; |
|
1343 | removed : g, ; | |
|
1344 | ##### revision "p-1" ##### | |||
|
1345 | 1 sidedata entries | |||
|
1346 | entry-0014 size 24 | |||
|
1347 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00tu' | |||
|
1348 | removed : t, ; | |||
|
1349 | added p1: u, t; | |||
|
1350 | ##### revision "p-2" ##### | |||
|
1351 | 1 sidedata entries | |||
|
1352 | entry-0014 size 24 | |||
|
1353 | '\x00\x00\x00\x02\x0c\x00\x00\x00\x01\x00\x00\x00\x00\x06\x00\x00\x00\x02\x00\x00\x00\x00uv' | |||
|
1354 | removed : u, ; | |||
|
1355 | added p1: v, u; | |||
1319 | ##### revision "mBAm-0 simple merge - A side" ##### |
|
1356 | ##### revision "mBAm-0 simple merge - A side" ##### | |
1320 | 1 sidedata entries |
|
1357 | 1 sidedata entries | |
1321 | entry-0014 size 4 |
|
1358 | entry-0014 size 4 |
General Comments 0
You need to be logged in to leave comments.
Login now