facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity
20edf348ee
sapling/tests/test-fetch.out

82 lines
2.8 KiB
Plaintext
Raw Normal View History

fetch: fix breakage from mpm. add test so will not break again.
2006-08-09 03:09:26 +04:00
adding a
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
2008-03-21 16:52:24 +03:00
updating working directory
fetch: fix breakage from mpm. add test so will not break again.
2006-08-09 03:09:26 +04:00
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
2008-03-21 16:52:24 +03:00
updating working directory
fetch: fix breakage from mpm. add test so will not break again.
2006-08-09 03:09:26 +04:00
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
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
2008-03-21 16:52:24 +03:00
updating working directory
fetch: hide authentication details
2008-01-04 22:58:27 +03:00
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
2008-03-21 16:52:24 +03:00
updating working directory
fetch: hide authentication details
2008-01-04 22:58:27 +03:00
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
2008-03-05 20:10:45 +03:00
% should merge c into a
fetch: fix breakage from mpm. add test so will not break again.
2006-08-09 03:09:26 +04:00
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
2008-03-05 20:10:45 +03:00
updating to 2:97d72e5f12c7
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
fetch: fix breakage from mpm. add test so will not break again.
2006-08-09 03:09:26 +04:00
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
test-fetch: make output stable
2006-08-09 03:23:02 +04:00
new changeset 3:cd3a41621cf0 merges remote changes with local
fetch: fix breakage from mpm. add test so will not break again.
2006-08-09 03:09:26 +04:00
a
b
c
fetch: hide authentication details
2008-01-04 22:58:27 +03:00
% 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)
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
2008-03-05 20:10:45 +03:00
updating to 2:97d72e5f12c7
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
fetch: hide authentication details
2008-01-04 22:58:27 +03:00
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
2008-03-14 03:39:15 +03:00
new changeset 3:... merges remote changes with local
fetch: hide authentication details
2008-01-04 22:58:27 +03:00
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)
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
2008-03-05 20:10:45 +03:00
updating to 2:97d72e5f12c7
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging with 1:5e056962225c
fetch: hide authentication details
2008-01-04 22:58:27 +03:00
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
2008-03-14 03:39:15 +03:00
new changeset 3:... merges remote changes with local
fetch: hide authentication details
2008-01-04 22:58:27 +03:00
Automated merge with http://localhost:20059/
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
2008-03-21 16:52:24 +03:00
updating working directory
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
2008-03-05 20:10:45 +03:00
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
2008-03-21 16:52:24 +03:00
updating working directory
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
2008-03-05 20:10:45 +03:00
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
fetch: make test reproducible, tiny code cleanup
2008-03-05 20:20:57 +03:00
new changeset 4:55aa4f32ec59 merges remote changes with local
fetch: don't proceed if working directory is missing files (issue988)
2008-03-11 21:38:12 +03:00
% should abort, because i is modified
abort: working directory is missing some files
Reference in New Issue Copy Permalink