##// 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).
Stefano Tortarolo - - Load All Authors

File last commit:

r6631:a2b13cac default
r6651:7f0dd352 default
Show More
test-branches.out
45 lines | 1.3 KiB | text/plain | TextLexer
/ tests / test-branches.out
History | Annotation | Raw |Copy content |Copy permalink
marked working directory as branch a
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
marked working directory as branch b
created new head
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
marked working directory as branch c
marked working directory as branch d
d 6:9c581c5ff105
b 4:22df7444f7c1
a 1:dd6b440dd85a
c 5:5ca481e59b8c (inactive)
default 0:19709c5a4e75 (inactive)
-------
d 6:9c581c5ff105
b 4:22df7444f7c1
a 1:dd6b440dd85a
--- Branch a
changeset: 1:dd6b440dd85a
branch: a
user: test
date: Thu Jan 01 00:00:01 1970 +0000
summary: Adding a branch
---- Branch b
changeset: 4:22df7444f7c1
branch: b
parent: 2:ac22033332d1
user: test
date: Thu Jan 01 00:00:04 1970 +0000
summary: Adding b branch head 2
changeset: 3:aee39cd168d0
branch: b
user: test
date: Thu Jan 01 00:00:03 1970 +0000
summary: Adding b branch head 1
changeset: 2:ac22033332d1
branch: b
parent: 0:19709c5a4e75
user: test
date: Thu Jan 01 00:00:02 1970 +0000
summary: Adding b branch