Show More
@@ -75,10 +75,16 b' Add some linear rename initialy' | |||||
75 | $ cp ../same-content.txt a |
|
75 | $ cp ../same-content.txt a | |
76 | $ cp ../same-content.txt b |
|
76 | $ cp ../same-content.txt b | |
77 | $ cp ../same-content.txt h |
|
77 | $ cp ../same-content.txt h | |
|
78 | $ echo "original content for P" > p | |||
|
79 | $ echo "original content for Q" > q | |||
|
80 | $ echo "original content for R" > r | |||
78 | $ hg ci -Am 'i-0 initial commit: a b h' |
|
81 | $ hg ci -Am 'i-0 initial commit: a b h' | |
79 | adding a |
|
82 | adding a | |
80 | adding b |
|
83 | adding b | |
81 | adding h |
|
84 | adding h | |
|
85 | adding p | |||
|
86 | adding q | |||
|
87 | adding r | |||
82 | $ hg mv a c |
|
88 | $ hg mv a c | |
83 | $ hg ci -Am 'i-1: a -move-> c' |
|
89 | $ hg ci -Am 'i-1: a -move-> c' | |
84 | $ hg mv c d |
|
90 | $ hg mv c d | |
@@ -652,7 +658,7 b' rename information actually conflict wit' | |||||
652 | $ case_desc="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)" |
|
658 | $ case_desc="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)" | |
653 |
|
659 | |||
654 | $ hg up 'desc("i-0")' |
|
660 | $ hg up 'desc("i-0")' | |
655 |
|
|
661 | 6 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
656 | $ hg mv b d |
|
662 | $ hg mv b d | |
657 | $ hg ci -m "h-1: b -(move)-> d" |
|
663 | $ hg ci -m "h-1: b -(move)-> d" | |
658 | created new head |
|
664 | created new head | |
@@ -1228,6 +1234,9 b' We upgrade a repository that is not usin' | |||||
1228 | added : a, ; |
|
1234 | added : a, ; | |
1229 | added : b, ; |
|
1235 | added : b, ; | |
1230 | added : h, ; |
|
1236 | added : h, ; | |
|
1237 | added : p, ; | |||
|
1238 | added : q, ; | |||
|
1239 | added : r, ; | |||
1231 |
|
1240 | |||
1232 | $ for rev in `hg log --rev 'all()' -T '{rev}\n'`; do |
|
1241 | $ for rev in `hg log --rev 'all()' -T '{rev}\n'`; do | |
1233 | > case_id=`hg log -r $rev -T '{word(0, desc, ":")}\n'` |
|
1242 | > case_id=`hg log -r $rev -T '{word(0, desc, ":")}\n'` | |
@@ -1237,11 +1246,14 b' We upgrade a repository that is not usin' | |||||
1237 | > done |
|
1246 | > done | |
1238 | ##### revision "i-0 initial commit" ##### |
|
1247 | ##### revision "i-0 initial commit" ##### | |
1239 | 1 sidedata entries |
|
1248 | 1 sidedata entries | |
1240 |
entry-0014 size |
|
1249 | entry-0014 size 64 | |
1241 | '\x00\x00\x00\x03\x04\x00\x00\x00\x01\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\x00abh' |
|
1250 | '\x00\x00\x00\x06\x04\x00\x00\x00\x01\x00\x00\x00\x00\x04\x00\x00\x00\x02\x00\x00\x00\x00\x04\x00\x00\x00\x03\x00\x00\x00\x00\x04\x00\x00\x00\x04\x00\x00\x00\x00\x04\x00\x00\x00\x05\x00\x00\x00\x00\x04\x00\x00\x00\x06\x00\x00\x00\x00abhpqr' | |
1242 | added : a, ; |
|
1251 | added : a, ; | |
1243 | added : b, ; |
|
1252 | added : b, ; | |
1244 | added : h, ; |
|
1253 | added : h, ; | |
|
1254 | added : p, ; | |||
|
1255 | added : q, ; | |||
|
1256 | added : r, ; | |||
1245 | ##### revision "i-1" ##### |
|
1257 | ##### revision "i-1" ##### | |
1246 | 1 sidedata entries |
|
1258 | 1 sidedata entries | |
1247 | entry-0014 size 24 |
|
1259 | entry-0014 size 24 |
General Comments 0
You need to be logged in to leave comments.
Login now