test-fetch.out
51 lines
| 1.7 KiB
| text/plain
|
TextLexer
/ tests / test-fetch.out
Vadim Gelfer
|
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 | ||||
Bryan O'Sullivan
|
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 | ||||
Vadim Gelfer
|
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) | ||||
merging with new head 2:97d72e5f12c7 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Vadim Gelfer
|
r2823 | new changeset 3:cd3a41621cf0 merges remote changes with local | ||
Vadim Gelfer
|
r2822 | a | ||
b | ||||
c | ||||
Bryan O'Sullivan
|
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) | ||||
merging with new head 2:97d72e5f12c7 | ||||
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) | ||||
merging with new head 2:97d72e5f12c7 | ||||
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/ | ||||