mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
153675561e
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
82 lines
2.8 KiB
Plaintext
82 lines
2.8 KiB
Plaintext
adding a
|
|
updating working directory
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
updating working directory
|
|
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
|
|
updating working directory
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
updating working directory
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
% should merge c into a
|
|
pulling from ../a
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files (+1 heads)
|
|
updating to 2:97d72e5f12c7
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
merging with 1:5e056962225c
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
new changeset 3:cd3a41621cf0 merges remote changes with local
|
|
a
|
|
b
|
|
c
|
|
% 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)
|
|
updating to 2:97d72e5f12c7
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
merging with 1:5e056962225c
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
new changeset 3:... merges remote changes with local
|
|
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)
|
|
updating to 2:97d72e5f12c7
|
|
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
merging with 1:5e056962225c
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
new changeset 3:... merges remote changes with local
|
|
Automated merge with http://localhost:20059/
|
|
updating working directory
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
updating working directory
|
|
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
|
|
new changeset 4:55aa4f32ec59 merges remote changes with local
|
|
% should abort, because i is modified
|
|
abort: working directory is missing some files
|