##// END OF EJS Templates
rebase: don't mark file as removed if missing in parent's manifest (issue2725)
rebase: don't mark file as removed if missing in parent's manifest (issue2725)

File last commit:

r12156:4c94b6d0 default
r13778:46c30432 default
Show More
test-copy-move-merge.t
63 lines | 1.3 KiB | text/troff | Tads3Lexer
/ tests / test-copy-move-merge.t
Pradeepkumar Gayam
tests: unify test-copy-move-merge
r11972 $ mkdir t
$ cd t
$ hg init
$ echo 1 > a
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -qAm "first"
Pradeepkumar Gayam
tests: unify test-copy-move-merge
r11972
$ hg cp a b
$ hg mv a c
$ echo 2 >> b
$ echo 2 >> c
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -qAm "second"
Pradeepkumar Gayam
tests: unify test-copy-move-merge
r11972
$ hg co -C 0
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo 0 > a
$ echo 1 >> a
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg ci -qAm "other"
Pradeepkumar Gayam
tests: unify test-copy-move-merge
r11972
$ hg merge --debug
searching for copies back to rev 1
unmatched files in other:
b
c
all copies found (* = to merge, ! = divergent):
c -> a *
b -> a *
checking for directory renames
resolving manifests
overwrite None partial False
Martin Geisler
tests: remove unneeded -d flags...
r12156 ancestor b8bf91eeebbc local add3f11052fa+ remote 17c05bb7fcb6
Pradeepkumar Gayam
tests: unify test-copy-move-merge
r11972 a: remote moved to c -> m
a: remote moved to b -> m
preserving a for resolve of b
preserving a for resolve of c
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
Martin Geisler
tests: remove unneeded -d flags...
r12156 my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
Pradeepkumar Gayam
tests: unify test-copy-move-merge
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
Martin Geisler
tests: remove unneeded -d flags...
r12156 my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
Pradeepkumar Gayam
tests: unify test-copy-move-merge
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