test-fetch.out
192 lines
| 6.9 KiB
| text/plain
|
TextLexer
/ tests / test-fetch.out
|
r7007 | % test fetch with default branches only | ||
|
r2822 | adding a | ||
|
r6338 | updating working directory | ||
|
r2822 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r6338 | updating working directory | ||
|
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 | ||||
|
r6338 | updating working directory | ||
|
r5798 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r6338 | updating working directory | ||
|
r5798 | 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 | ||
|
r6246 | new changeset 3:... merges remote changes with local | ||
|
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) | ||||
|
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 | ||
|
r6246 | new changeset 3:... merges remote changes with local | ||
|
r5798 | Automated merge with http://localhost:20059/ | ||
|
r6338 | updating working directory | ||
|
r6206 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
r6338 | updating working directory | ||
|
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 | ||||
|
r6207 | new changeset 4:55aa4f32ec59 merges remote changes with local | ||
|
r6226 | % should abort, because i is modified | ||
abort: working directory is missing some files | ||||
|
r7007 | % test fetch with named branches | ||
adding a | ||||
marked working directory as branch a | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
marked working directory as branch b | ||||
adding b | ||||
created new head | ||||
% pull in change on foreign branch | ||||
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 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
pulling from n1 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
|
r7415 | added 1 changesets with 1 changes to 1 files | ||
|
r7007 | % parent should be 2 (no automatic update) | ||
2 | ||||
% pull in changes on both foreign and local branches | ||||
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 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
pulling from n1 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 2 changesets with 2 changes to 2 files | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
% parent should be 4 (fast forward) | ||||
4 | ||||
% pull changes on foreign (2 new heads) and local (1 new head) branches | ||||
% with a local change | ||||
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 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
created new head | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
adding c | ||||
pulling from n1 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 3 changesets with 3 changes to 2 files (+2 heads) | ||||
updating to 5:708c6cce3d26 | ||||
1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
merging with 3:d83427717b1f | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
new changeset 7:48f1a33f52af merges remote changes with local | ||||
% parent should be 7 (new merge changeset) | ||||
7 | ||||
% pull in changes on foreign (merge of local branch) and local (2 new | ||||
% heads) with a local change | ||||
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 | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
(branch merge, don't forget to commit) | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
created new head | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
created new head | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
pulling from n1 | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 3 changesets with 2 changes to 1 files (+2 heads) | ||||
not merging with 1 other new branch heads (use "hg heads ." and "hg merge" to merge them) | ||||
% parent should be 3 (fetch did not merge anything) | ||||
3 | ||||
|
r7049 | % pull in change on different branch than dirstate | ||
adding a | ||||
updating working directory | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
marked working directory as branch topic | ||||
abort: working dir not at branch tip (use "hg update" to check out branch tip) | ||||
% parent should be 0 (fetch did not update or merge anything) | ||||
0 | ||||
|
r7855 | % test fetch with inactive branches | ||
adding a | ||||
marked working directory as branch second | ||||
adding b | ||||
marked working directory as branch default | ||||
adding c | ||||
updating working directory | ||||
3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
% fetch should succeed | ||||
pulling from ../ib1 | ||||
searching for changes | ||||
no changes found | ||||