##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

addremove: correctly handle intermediate symlinks...
addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).
Matt Mackall - - Load All Authors

File last commit:

r6646:9eb274d7 default
r6651:7f0dd352 default
Show More
test-merge-remove.out
37 lines | 738 B | text/plain | TextLexer
/ tests / test-merge-remove.out
History | Source | Raw |Copy content |Copy permalink
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Alexis S. L. Carvalho
dirstate.remove: during merges, remember the previous file state...
 r6297 merging foo1 and foo
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n 0 -2 bar
m 644 14 foo1
copy: foo -> foo1
M bar
M foo1
% removing foo1 and bar
r 0 -2 bar
r 0 -1 foo1
copy: foo -> foo1
R bar
R foo1
foo
Alexis S. L. Carvalho
normallookup: during merges, restore the state saved by remove
 r6298 % readding foo1 and bar
adding bar
adding foo1
n 0 -2 bar
m 644 14 foo1
copy: foo -> foo1
M bar
M foo1
foo
Alexis S. L. Carvalho
revert: update state of files in the "checkout" list...
 r6299 % reverting foo1 and bar
warning: working directory has two parents, tag '.' uses the first
saving current version of bar as bar.orig
reverting bar
saving current version of foo1 as foo1.orig
reverting foo1
n 0 -2 bar
m 644 14 foo1
copy: foo -> foo1
M bar
M foo1
foo