##// 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-fetch.out
81 lines | 2.8 KiB | text/plain | TextLexer
/ tests / test-fetch.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
fetch: fix breakage from mpm....
 r2822 adding a
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Vadim Gelfer
fetch: fix breakage from mpm....
 r2822 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Vadim Gelfer
fetch: fix breakage from mpm....
 r2822 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
1:97d72e5f12c7
% should pull one change
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1:97d72e5f12c7
adding c
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Bryan O'Sullivan
fetch: hide authentication details
 r5798 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Bryan O'Sullivan
fetch: hide authentication details
 r5798 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
fetch: switch the default parent used for a merge...
 r6206 % should merge c into a
Vadim Gelfer
fetch: fix breakage from mpm....
 r2822 pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Bryan O'Sullivan
fetch: switch the default parent used for a merge...
 r6206 updating to 2:97d72e5f12c7
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
Vadim Gelfer
fetch: fix breakage from mpm....
 r2822 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Vadim Gelfer
test-fetch: make output stable
 r2823 new changeset 3:cd3a41621cf0 merges remote changes with local
Vadim Gelfer
fetch: fix breakage from mpm....
 r2822 a
b
c
Bryan O'Sullivan
fetch: hide authentication details
 r5798 % fetch over http, no auth
pulling from http://localhost:20059/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Bryan O'Sullivan
fetch: switch the default parent used for a merge...
 r6206 updating to 2:97d72e5f12c7
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
Bryan O'Sullivan
fetch: hide authentication details
 r5798 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
 r6246 new changeset 3:... merges remote changes with local
Bryan O'Sullivan
fetch: hide authentication details
 r5798 Automated merge with http://localhost:20059/
% fetch over http with auth (should be hidden in desc)
pulling from http://user:***@localhost:20059/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Bryan O'Sullivan
fetch: switch the default parent used for a merge...
 r6206 updating to 2:97d72e5f12c7
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
Bryan O'Sullivan
fetch: hide authentication details
 r5798 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Thomas Arendsen Hein
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
 r6246 new changeset 3:... merges remote changes with local
Bryan O'Sullivan
fetch: hide authentication details
 r5798 Automated merge with http://localhost:20059/
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Bryan O'Sullivan
fetch: switch the default parent used for a merge...
 r6206 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann
clone: print "updating working directory" status message...
 r6338 updating working directory
Bryan O'Sullivan
fetch: switch the default parent used for a merge...
 r6206 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding f
adding g
% should merge f into g
pulling from ../f
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging with 3:cc6a3744834d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Bryan O'Sullivan
fetch: make test reproducible, tiny code cleanup
 r6207 new changeset 4:55aa4f32ec59 merges remote changes with local
Bryan O'Sullivan
fetch: don't proceed if working directory is missing files (issue988)
 r6226 % should abort, because i is modified
abort: working directory is missing some files