test-fetch.out
73 lines
| 2.5 KiB
| text/plain
|
TextLexer
/ tests / test-fetch.out
|
r2822 | adding a | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
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 | ||||
|
r5798 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r6206 | % should merge c into a | ||
|
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) | ||||
|
r6206 | updating to 2:97d72e5f12c7 | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
merging with 1:5e056962225c | ||||
|
r2822 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r2823 | new changeset 3:cd3a41621cf0 merges remote changes with local | ||
|
r2822 | a | ||
b | ||||
c | ||||
|
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) | ||||
|
r6206 | updating to 2:97d72e5f12c7 | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
merging with 1:5e056962225c | ||||
|
r5798 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
new changeset 3:0b6439e938f9 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) | ||||
|
r6206 | updating to 2:97d72e5f12c7 | ||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
merging with 1:5e056962225c | ||||
|
r5798 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
new changeset 3:0b6439e938f9 merges remote changes with local | ||||
Automated merge with http://localhost:20059/ | ||||
|
r6206 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
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:96d2275e70b4 merges remote changes with local | ||||