test-copy-move-merge.t
64 lines
| 1.4 KiB
| text/troff
|
Tads3Lexer
/ tests / test-copy-move-merge.t
|
r13956 | $ hg init t | ||
|
r11972 | $ cd t | ||
$ echo 1 > a | ||||
|
r12156 | $ hg ci -qAm "first" | ||
|
r11972 | |||
$ hg cp a b | ||||
$ hg mv a c | ||||
$ echo 2 >> b | ||||
$ echo 2 >> c | ||||
|
r12156 | $ hg ci -qAm "second" | ||
|
r11972 | |||
$ hg co -C 0 | ||||
1 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
$ echo 0 > a | ||||
$ echo 1 >> a | ||||
|
r12156 | $ hg ci -qAm "other" | ||
|
r11972 | |||
$ hg merge --debug | ||||
searching for copies back to rev 1 | ||||
unmatched files in other: | ||||
b | ||||
c | ||||
|
r16795 | all copies found (* = to merge, ! = divergent, % = renamed and deleted): | ||
|
r18362 | src: 'a' -> dst: 'b' * | ||
|
r18135 | src: 'a' -> dst: 'c' * | ||
|
r11972 | checking for directory renames | ||
resolving manifests | ||||
|
r15625 | overwrite: False, partial: False | ||
ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 | ||||
|
r18360 | a: remote moved to b -> m | ||
|
r18541 | preserving a for resolve of b | ||
|
r11972 | a: remote moved to c -> m | ||
|
r18541 | preserving a for resolve of c | ||
|
r11972 | removing a | ||
updating: a 1/2 files (50.00%) | ||||
picked tool 'internal:merge' for b (binary False symlink False) | ||||
merging a and b to b | ||||
|
r12156 | my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc | ||
|
r11972 | premerge successful | ||
updating: a 2/2 files (100.00%) | ||||
picked tool 'internal:merge' for c (binary False symlink False) | ||||
merging a and c to c | ||||
|
r12156 | my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc | ||
|
r11972 | premerge successful | ||
0 files updated, 2 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
file b | ||||
$ cat b | ||||
0 | ||||
1 | ||||
2 | ||||
file c | ||||
$ cat c | ||||
0 | ||||
1 | ||||
2 | ||||
|
r16913 | |||
$ cd .. | ||||