Mercurial > hg-stable
changeset 15244:f6d5d01725db
tests: cleanup of test-fetch.t
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 13 Oct 2011 04:27:49 +0200 |
| parents | 1e9451476bf8 |
| children | aa2c35057f47 |
| files | tests/test-fetch.t |
| diffstat | 1 files changed, 42 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-fetch.t Thu Oct 13 04:27:49 2011 +0200 +++ b/tests/test-fetch.t Thu Oct 13 04:27:49 2011 +0200 @@ -1,5 +1,3 @@ -adjust to non-default HGPORT, e.g. with run-tests.py -j - $ echo "[extensions]" >> $HGRCPATH $ echo "fetch=" >> $HGRCPATH @@ -7,7 +5,7 @@ $ hg init a $ echo a > a/a - $ hg --cwd a commit -d '1 0' -Ama + $ hg --cwd a commit -Ama adding a $ hg clone a b updating to branch default @@ -16,10 +14,10 @@ updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b > a/b - $ hg --cwd a commit -d '2 0' -Amb + $ hg --cwd a commit -Amb adding b $ hg --cwd a parents -q - 1:97d72e5f12c7 + 1:d2ae7f538514 should pull one change @@ -32,9 +30,9 @@ added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg --cwd b parents -q - 1:97d72e5f12c7 + 1:d2ae7f538514 $ echo c > c/c - $ hg --cwd c commit -d '3 0' -Amc + $ hg --cwd c commit -Amc adding c $ hg clone c d updating to branch default @@ -48,39 +46,37 @@ message, making every commit appear different. should merge c into a - $ hg --cwd c fetch -d '4 0' -m 'automated merge' ../a + $ hg --cwd c fetch -d '0 0' -m 'automated merge' ../a pulling from ../a searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - updating to 2:97d72e5f12c7 + updating to 2:d2ae7f538514 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - merging with 1:5e056962225c + merging with 1:d36c0562f908 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 3:cd3a41621cf0 merges remote changes with local + new changeset 3:a323a0c43ec4 merges remote changes with local $ ls c a b c - $ netstat -tnap 2>/dev/null | grep $HGPORT | grep LISTEN - [1] $ hg --cwd a serve -a localhost -p $HGPORT -d --pid-file=hg.pid $ cat a/hg.pid >> "$DAEMON_PIDS" fetch over http, no auth - $ hg --cwd d fetch -d '5 0' http://localhost:$HGPORT/ + $ hg --cwd d fetch http://localhost:$HGPORT/ pulling from http://localhost:$HGPORT/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - updating to 2:97d72e5f12c7 + updating to 2:d2ae7f538514 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - merging with 1:5e056962225c + merging with 1:d36c0562f908 1 files updated, 0 files merged, 0 files removed, 0 files unresolved new changeset 3:* merges remote changes with local (glob) $ hg --cwd d tip --template '{desc}\n' @@ -88,16 +84,16 @@ fetch over http with auth (should be hidden in desc) - $ hg --cwd e fetch -d '5 0' http://user:password@localhost:$HGPORT/ + $ hg --cwd e fetch http://user:password@localhost:$HGPORT/ pulling from http://user:***@localhost:$HGPORT/ searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) - updating to 2:97d72e5f12c7 + updating to 2:d2ae7f538514 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - merging with 1:5e056962225c + merging with 1:d36c0562f908 1 files updated, 0 files merged, 0 files removed, 0 files unresolved new changeset 3:* merges remote changes with local (glob) $ hg --cwd e tip --template '{desc}\n' @@ -109,17 +105,17 @@ updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo f > f/f - $ hg --cwd f ci -d '6 0' -Amf + $ hg --cwd f ci -Amf adding f $ echo g > g/g - $ hg --cwd g ci -d '6 0' -Amg + $ hg --cwd g ci -Amg adding g $ hg clone -q f h $ hg clone -q g i should merge f into g - $ hg --cwd g fetch -d '7 0' --switch -m 'automated merge' ../f + $ hg --cwd g fetch -d '0 0' --switch -m 'automated merge' ../f pulling from ../f searching for changes adding changesets @@ -127,9 +123,9 @@ 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 + merging with 3:6343ca3eff20 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 4:55aa4f32ec59 merges remote changes with local + new changeset 4:f7faa0b7d3c6 merges remote changes with local $ rm i/g should abort, because i is modified @@ -142,18 +138,18 @@ $ hg init nbase $ echo base > nbase/a - $ hg -R nbase ci -d '1 0' -Am base + $ hg -R nbase ci -Am base adding a $ hg -R nbase branch a marked working directory as branch a $ echo a > nbase/a - $ hg -R nbase ci -d '2 0' -m a + $ hg -R nbase ci -m a $ hg -R nbase up -C 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg -R nbase branch b marked working directory as branch b $ echo b > nbase/b - $ hg -R nbase ci -Ad '3 0' -m b + $ hg -R nbase ci -Am b adding b pull in change on foreign branch @@ -167,10 +163,10 @@ $ hg -R n1 up -C a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo aa > n1/a - $ hg -R n1 ci -d '4 0' -m a1 + $ hg -R n1 ci -m a1 $ hg -R n2 up -C b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R n2 fetch -d '9 0' -m 'merge' n1 + $ hg -R n2 fetch -m 'merge' n1 pulling from n1 searching for changes adding changesets @@ -195,14 +191,14 @@ $ hg -R n1 up -C a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo aa > n1/a - $ hg -R n1 ci -d '4 0' -m a1 + $ hg -R n1 ci -m a1 $ hg -R n1 up -C b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo bb > n1/b - $ hg -R n1 ci -d '5 0' -m b1 + $ hg -R n1 ci -m b1 $ hg -R n2 up -C b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - $ hg -R n2 fetch -d '9 0' -m 'merge' n1 + $ hg -R n2 fetch -m 'merge' n1 pulling from n1 searching for changes adding changesets @@ -229,33 +225,33 @@ $ hg -R n1 up -C a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a1 > n1/a - $ hg -R n1 ci -d '4 0' -m a1 + $ hg -R n1 ci -m a1 $ hg -R n1 up -C b 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo bb > n1/b - $ hg -R n1 ci -d '5 0' -m b1 + $ hg -R n1 ci -m b1 $ hg -R n1 up -C 1 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo a2 > n1/a - $ hg -R n1 ci -d '6 0' -m a2 + $ hg -R n1 ci -m a2 created new head $ hg -R n2 up -C b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo change >> n2/c - $ hg -R n2 ci -Ad '7 0' -m local + $ hg -R n2 ci -A -m local adding c - $ hg -R n2 fetch -d '9 0' -m 'merge' n1 + $ hg -R n2 fetch -d '0 0' -m 'merge' n1 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 + updating to 5:3c4a837a864f 1 files updated, 0 files merged, 1 files removed, 0 files unresolved - merging with 3:d83427717b1f + merging with 3:1267f84a9ea5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - new changeset 7:48f1a33f52af merges remote changes with local + new changeset 7:2cf2a1261f21 merges remote changes with local parent should be 7 (new merge changeset) @@ -277,21 +273,21 @@ $ hg -R n1 merge b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) - $ hg -R n1 ci -d '4 0' -m merge + $ hg -R n1 ci -m merge $ hg -R n1 up -C 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo c > n1/a - $ hg -R n1 ci -d '5 0' -m c + $ hg -R n1 ci -m c $ hg -R n1 up -C 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo cc > n1/a - $ hg -R n1 ci -d '6 0' -m cc + $ hg -R n1 ci -m cc created new head $ hg -R n2 up -C b 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo change >> n2/b - $ hg -R n2 ci -Ad '7 0' -m local - $ hg -R n2 fetch -d '9 0' -m 'merge' n1 + $ hg -R n2 ci -A -m local + $ hg -R n2 fetch -m 'merge' n1 pulling from n1 searching for changes adding changesets @@ -320,7 +316,7 @@ $ hg -R n1 ci -m next $ hg -R n2 branch topic marked working directory as branch topic - $ hg -R n2 fetch -d '0 0' -m merge n1 + $ hg -R n2 fetch -m merge n1 abort: working dir not at branch tip (use "hg update" to check out branch tip) [255] @@ -407,4 +403,3 @@ adding manifests adding file changes added 1 changesets with 1 changes to 1 files - $ "$TESTDIR/killdaemons.py"