Mercurial > hg
comparison tests/test-fetch.t @ 12535:975ec4ce961c
tests: fix test-fetch port number variability
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 27 Sep 2010 10:39:22 -0500 |
| parents | dd600141616d |
| children | d08bb64888bc |
comparison
equal
deleted
inserted
replaced
| 12534:3ee3d7634e94 | 12535:975ec4ce961c |
|---|---|
| 80 added 1 changesets with 1 changes to 1 files (+1 heads) | 80 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 81 updating to 2:97d72e5f12c7 | 81 updating to 2:97d72e5f12c7 |
| 82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 82 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 83 merging with 1:5e056962225c | 83 merging with 1:5e056962225c |
| 84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 84 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 85 new changeset 3:0b6439e938f9 merges remote changes with local | 85 new changeset 3:* merges remote changes with local (glob) |
| 86 $ hg --cwd d tip --template '{desc}\n' | 86 $ hg --cwd d tip --template '{desc}\n' |
| 87 Automated merge with http://localhost:*/ (glob) | 87 Automated merge with http://localhost:*/ (glob) |
| 88 | 88 |
| 89 fetch over http with auth (should be hidden in desc) | 89 fetch over http with auth (should be hidden in desc) |
| 90 | 90 |
| 97 added 1 changesets with 1 changes to 1 files (+1 heads) | 97 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 98 updating to 2:97d72e5f12c7 | 98 updating to 2:97d72e5f12c7 |
| 99 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 99 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 100 merging with 1:5e056962225c | 100 merging with 1:5e056962225c |
| 101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 101 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 102 new changeset 3:0b6439e938f9 merges remote changes with local | 102 new changeset 3:* merges remote changes with local (glob) |
| 103 $ hg --cwd e tip --template '{desc}\n' | 103 $ hg --cwd e tip --template '{desc}\n' |
| 104 Automated merge with http://localhost:*/ (glob) | 104 Automated merge with http://localhost:*/ (glob) |
| 105 $ hg clone a f | 105 $ hg clone a f |
| 106 updating to branch default | 106 updating to branch default |
| 107 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 107 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |