diff --git a/tests/test-default-push.out b/tests/test-default-push.out deleted file mode 100644 --- a/tests/test-default-push.out +++ /dev/null @@ -1,19 +0,0 @@ -adding a -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -updating to branch default -1 files updated, 0 files merged, 0 files removed, 0 files unresolved -% push should push to default when default-push not set -pushing -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files -% push should push to default-push when set -pushing -searching for changes -adding changesets -adding manifests -adding file changes -added 1 changesets with 1 changes to 1 files diff --git a/tests/test-default-push b/tests/test-default-push.t old mode 100755 new mode 100644 rename from tests/test-default-push rename to tests/test-default-push.t --- a/tests/test-default-push +++ b/tests/test-default-push.t @@ -1,18 +1,38 @@ -#!/bin/sh + $ hg init a + + $ echo a > a/a + $ hg --cwd a ci -Ama + adding a -hg init a -echo a > a/a -hg --cwd a ci -Ama + $ hg clone a c + updating to branch default + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved -hg clone a c + $ hg clone a b + updating to branch default + 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + + $ echo b >> b/a + $ hg --cwd b ci -mb + +Push should push to 'default' when 'default-push' not set: -hg clone a b -echo b >> b/a -hg --cwd b ci -mb + $ hg --cwd b push + pushing to .*/a + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files + +Push should push to 'default-push' when set: -echo % push should push to default when default-push not set -hg --cwd b push | sed 's/pushing to.*/pushing/' + $ echo 'default-push = ../c' >> b/.hg/hgrc + $ hg --cwd b push + pushing to .*/c + searching for changes + adding changesets + adding manifests + adding file changes + added 1 changesets with 1 changes to 1 files -echo % push should push to default-push when set -echo 'default-push = ../c' >> b/.hg/hgrc -hg --cwd b push | sed 's/pushing to.*/pushing/'