test-fetch.out
216 lines
| 7.5 KiB
| text/plain
|
TextLexer
/ tests / test-fetch.out
Sune Foldager
|
r7007 | % test fetch with default branches only | ||
Vadim Gelfer
|
r2822 | adding a | ||
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Vadim Gelfer
|
r2822 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Vadim Gelfer
|
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 | ||||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
Bryan O'Sullivan
|
r5798 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Bryan O'Sullivan
|
r5798 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Bryan O'Sullivan
|
r6206 | % should merge c into a | ||
|
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) | ||||
|
Bryan O'Sullivan
|
r6206 | updating to 2:97d72e5f12c7 | ||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| merging with 1:5e056962225c | ||||
|
Vadim Gelfer
|
r2822 | 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 | ||
Mads Kiilerich
|
r10398 | pulling from http://localhost:$HGPORT/ | ||
|
Bryan O'Sullivan
|
r5798 | searching for changes | ||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
Bryan O'Sullivan
|
r6206 | updating to 2:97d72e5f12c7 | ||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| merging with 1:5e056962225c | ||||
|
Bryan O'Sullivan
|
r5798 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
Thomas Arendsen Hein
|
r6246 | new changeset 3:... merges remote changes with local | ||
|
Mads Kiilerich
|
r10398 | Automated merge with http://localhost:$HGPORT/ | ||
|
Bryan O'Sullivan
|
r5798 | % fetch over http with auth (should be hidden in desc) | ||
|
Mads Kiilerich
|
r10398 | pulling from http://user:***@localhost:$HGPORT/ | ||
|
Bryan O'Sullivan
|
r5798 | searching for changes | ||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
|
Bryan O'Sullivan
|
r6206 | updating to 2:97d72e5f12c7 | ||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| merging with 1:5e056962225c | ||||
|
Bryan O'Sullivan
|
r5798 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Thomas Arendsen Hein
|
r6246 | new changeset 3:... merges remote changes with local | ||
|
Mads Kiilerich
|
r10398 | Automated merge with http://localhost:$HGPORT/ | ||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Bryan O'Sullivan
|
r6206 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Bryan O'Sullivan
|
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 | ||||
|
Bryan O'Sullivan
|
r6207 | new changeset 4:55aa4f32ec59 merges remote changes with local | ||
|
Bryan O'Sullivan
|
r6226 | % should abort, because i is modified | ||
| abort: working directory is missing some files | ||||
|
Sune Foldager
|
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 | ||||
| % pull in change on foreign branch | ||||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Sune Foldager
|
r7007 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Sune Foldager
|
r7007 | 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 | ||||
Benoit Boissinot
|
r7415 | added 1 changesets with 1 changes to 1 files | ||
|
Sune Foldager
|
r7007 | % parent should be 2 (no automatic update) | ||
| 2 | ||||
| % pull in changes on both foreign and local branches | ||||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Sune Foldager
|
r7007 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Sune Foldager
|
r7007 | 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 | ||||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Sune Foldager
|
r7007 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Sune Foldager
|
r7007 | 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 | ||||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Sune Foldager
|
r7007 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Sune Foldager
|
r7007 | 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 | ||||
| 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 | ||||
|
Sune Foldager
|
r7049 | % pull in change on different branch than dirstate | ||
| adding a | ||||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Sune Foldager
|
r7049 | 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 | ||||
Benjamin Pollack
|
r7855 | % test fetch with inactive branches | ||
| adding a | ||||
| marked working directory as branch second | ||||
| adding b | ||||
| marked working directory as branch default | ||||
| adding c | ||||
Gilles Moris
|
r11317 | created new head | ||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Benjamin Pollack
|
r7855 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| % fetch should succeed | ||||
| pulling from ../ib1 | ||||
| searching for changes | ||||
| no changes found | ||||
Henrik Stuart
|
r9093 | % test issue1726 | ||
| adding a | ||||
|
Adrian Buehlmann
|
r9611 | updating to branch default | ||
|
Henrik Stuart
|
r9093 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| pulling from ../i1726r1 | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| updating to 2:7837755a2789 | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| merging with 1:d1f0c6c48ebd | ||||
| merging a | ||||
| 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||||
| new changeset 3 merges remote changes with local | ||||
| 3 | ||||
|
Sune Foldager
|
r10580 | |||
| % test issue2047 | ||||
Steve Borho
|
r10581 | pulling from ../i2047a | ||
|
Sune Foldager
|
r10580 | searching for changes | ||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 1 changesets with 1 changes to 1 files | ||||