##// 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).
Thomas Arendsen Hein - - Load All Authors

File last commit:

r6381:0b89315d default
r6651:7f0dd352 default
Show More
test-merge5.out
7 lines | 266 B | text/plain | TextLexer
/ tests / test-merge5.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
Update tests to match new addremove chattiness.
 r767 removing b
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
update: no -C needed to switch branches without outstanding changes
 r6350 % should abort
Matt Mackall
update: better logic and messages for updates...
 r6375 abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
Matt Mackall
update: no -C needed to switch branches without outstanding changes
 r6350 % should succeed
Thomas Arendsen Hein
Fix missing space in one of the new update messages.
 r6381 abort: crosses branches (use 'hg merge' or 'hg update -C')