##// 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).
Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default
r6651:7f0dd352 default
Show More
test-empty-group.out
80 lines | 2.1 KiB | text/plain | TextLexer
/ tests / test-empty-group.out
History | Source | Raw |Copy content |Copy permalink
Benoit Boissinot
document and fix findincoming...
 r2339 adding init
adding x
adding y
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
adding x
adding y
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Benoit Boissinot
document and fix findincoming...
 r2339 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Benoit Boissinot
document and fix findincoming...
 r2339 requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Benoit Boissinot
document and fix findincoming...
 r2339 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Benoit Boissinot
document and fix findincoming...
 r2339 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Alexis S. L. Carvalho
incoming/outgoing: print the name of the other repo
 r4162 comparing with b
Benoit Boissinot
document and fix findincoming...
 r2339 searching for changes
changeset: 4:fdb3c546e859
tag: tip
parent: 1:1f703b3fcbc6
parent: 2:de997049e034
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: m2
Alexis S. L. Carvalho
incoming/outgoing: print the name of the other repo
 r4162 comparing with c
Benoit Boissinot
document and fix findincoming...
 r2339 searching for changes
changeset: 3:f40f830c0024
parent: 2:de997049e034
parent: 1:1f703b3fcbc6
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: m1
Alexis S. L. Carvalho
incoming/outgoing: print the name of the other repo
 r4162 comparing with c
Benoit Boissinot
document and fix findincoming...
 r2339 searching for changes
changeset: 3:f40f830c0024
tag: tip
parent: 2:de997049e034
parent: 1:1f703b3fcbc6
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: m1
Alexis S. L. Carvalho
incoming/outgoing: print the name of the other repo
 r4162 comparing with b
Benoit Boissinot
document and fix findincoming...
 r2339 searching for changes
changeset: 3:fdb3c546e859
tag: tip
parent: 1:1f703b3fcbc6
parent: 2:de997049e034
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: m2
pulling from a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
pulling from a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)