--- a/tests/test-push-warn Mon Oct 19 07:14:44 2009 +0200
+++ b/tests/test-push-warn Sat Oct 17 15:40:34 2009 +0200
@@ -125,19 +125,19 @@
echo % checking prepush logic does not allow silently pushing multiple new heads
cd ..
-hg init g
-echo init > g/init
-hg -R g ci -Am init
-echo a > g/a
-hg -R g ci -Am a
-hg clone g h
-hg -R g up 0
-echo b > g/b
-hg -R g ci -Am b
+hg init h
+echo init > h/init
+hg -R h ci -Am init
+echo a > h/a
+hg -R h ci -Am a
+hg clone h i
hg -R h up 0
-echo c > h/c
-hg -R h ci -Am c
-hg -R h push g
+echo b > h/b
+hg -R h ci -Am b
+hg -R i up 0
+echo c > i/c
+hg -R i ci -Am c
+hg -R i push h
echo
exit 0
--- a/tests/test-push-warn.out Mon Oct 19 07:14:44 2009 +0200
+++ b/tests/test-push-warn.out Sat Oct 17 15:40:34 2009 +0200
@@ -125,18 +125,17 @@
added 2 changesets with 2 changes to 1 files
0
% checking prepush logic does not allow silently pushing multiple new heads
-abort: repository g already exists!
adding init
adding a
updating working directory
-3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding b
created new head
-1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
adding c
created new head
-pushing to g
+pushing to h
searching for changes
abort: push creates new remote heads!
(did you forget to merge? use push -f to force)