##// END OF EJS Templates
largefiles: unlink standins not known to the restored dirstate at rollback...
largefiles: unlink standins not known to the restored dirstate at rollback Before this patch, standinds not known to the restored dirstate at rollback still exist after rollback of the parent of the working directory, and they become orphans unexpectedly. This patch unlinks standins not known to the restored dirstate. This patch saves names of standins matched against not "repo.dirstate[f] == 'a'" but "repo.dirstate[f] != 'r'" before rollback, because branch merging marks files newly added to dirstate as not "a" but "n". Such standins will also become orphan after rollback, because they are not known to the restored dirstate.

File last commit:

r21391:cb158354 default
r22286:3f3b9483 default
Show More
test-copy-move-merge.t
64 lines | 1.4 KiB | text/troff | Tads3Lexer
/ tests / test-copy-move-merge.t
Martin Geisler
tests: remove redundant mkdir...
r13956 $ hg init t
Pradeepkumar Gayam
tests: unify test-copy-move-merge
r11972 $ cd t
$ 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
Thomas Arendsen Hein
merge: show renamed on one and deleted on the other side in debug output
r16795 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
Mads Kiilerich
copies: report found copies sorted
r18362 src: 'a' -> dst: 'b' *
Siddharth Agarwal
copies: make debug messages more sensible...
r18135 src: 'a' -> dst: 'c' *
Pradeepkumar Gayam
tests: unify test-copy-move-merge
r11972 checking for directory renames
resolving manifests
Siddharth Agarwal
manifestmerge: pass in branchmerge and force separately...
r18605 branchmerge: True, force: False, partial: False
Martin Geisler
merge: make debug output easier to read...
r15625 ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
Mads Kiilerich
merge: change debug logging - test output changes but no real changes...
r21391 preserving a for resolve of b
preserving a for resolve of c
removing a
Mads Kiilerich
merge: keep destination filename as key in filemerge actions...
r20945 b: remote moved from a -> m
updating: b 1/2 files (50.00%)
Pradeepkumar Gayam
tests: unify test-copy-move-merge
r11972 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
Mads Kiilerich
merge: change debug logging - test output changes but no real changes...
r21391 c: remote moved from a -> m
Mads Kiilerich
merge: keep destination filename as key in filemerge actions...
r20945 updating: c 2/2 files (100.00%)
Pradeepkumar Gayam
tests: unify test-copy-move-merge
r11972 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
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..