diff tests/test-push-warn.out @ 838:0fc4b1ab57e3

Merge with Matt.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 04 Aug 2005 05:14:59 -0800
parents 8674b7803714
children 9c918287d10b
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/tests/test-push-warn.out
@@ -0,0 +1,35 @@
++ hg init
++ hg add t1
++ hg commit -m 1 -d 0 0
++ hg clone a b
++ hg add t2
++ hg commit -m 2 -d 0 0
++ hg add t3
++ hg commit -m 3 -d 0 0
++ hg push ../a
+pushing to ../a
+searching for changes
+abort: unsynced remote changes!
+(did you forget to sync? use push -f to force)
++ hg pull ../a
+pulling from ../a
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 1 changesets with 1 changes to 1 files
+(run 'hg update' to get a working copy)
++ hg push ../a
+pushing to ../a
+searching for changes
+abort: push creates new remote branches!
+(did you forget to merge? use push -f to force)
++ hg up -m
++ hg commit -m 4 -d 0 0
++ hg push ../a
+pushing to ../a
+searching for changes
+adding changesets
+adding manifests
+adding file changes
+added 2 changesets with 2 changes to 2 files