##// END OF EJS Templates
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).

File last commit:

r6338:0750f111 default
r6651:7f0dd352 default
Show More
test-http-clone-r.out
193 lines | 6.5 KiB | text/plain | TextLexer
/ tests / test-http-clone-r.out
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 # creating 'remote'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
r6336 created new head
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
rev offset length base linkrev nodeid p1 p2
0 0 3 0 0 362fef284ce2 000000000000 000000000000
1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
2 8 7 2 2 4c982badb186 125144f7e028 000000000000
3 15 9 3 3 19b1fc555737 4c982badb186 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 75 0 7 905359268f77 000000000000 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 75 0 8 905359268f77 000000000000 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 48 0 0 43eadb1d2d06 000000000000 000000000000
1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000
2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000
3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000
4 192 58 3 6 de68e904d169 626a32663c2f 000000000000
5 250 68 3 7 3b45cc2ab868 de68e904d169 000000000000
6 318 54 6 8 24d86153a002 f54c32f13478 000000000000
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
# Starting server
# clone remote via stream
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 4 changesets, 4 total revisions
requesting all changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
requesting all changes
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
requesting all changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 4 changesets, 5 total revisions
requesting all changes
adding changesets
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
3 files, 5 changesets, 6 total revisions
requesting all changes
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
Adrian Buehlmann
clone: print "updating working directory" status message...
r6338 updating working directory
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 5 total revisions
pulling from ../test-7
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 pulling from http://localhost/
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 2 total revisions
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 pulling from http://localhost/
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 searching for changes
adding changesets
adding manifests
adding file changes
added 6 changesets with 5 changes to 4 files
(run 'hg update' to get a working copy)
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 pulling from http://localhost/
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 0 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 5 changesets, 3 total revisions
Bryan O'Sullivan
Allow tests to run in parallel.
r5384 pulling from http://localhost/
Eric Hopper
Testing the new changegroupsubset remote function in the ssh...
r3449 searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 4 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions