tests/test-push-warn.out
author Bryan O'Sullivan <bos@serpentine.com>
Thu, 04 Aug 2005 05:14:59 -0800
changeset 838 0fc4b1ab57e3
parent 816 8674b7803714
child 839 9c918287d10b
permissions -rw-r--r--
Merge with Matt.

+ 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