Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-push-warn.out @ 3797:2aef481ac73c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't report an error when closing heads during local push (issue387)
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 05 Dec 2006 23:25:28 +0100
parents 975c2469c316
children 27230c29bfec
line wrap: on
line diff
--- a/tests/test-push-warn.out
+++ b/tests/test-push-warn.out
@@ -33,22 +33,32 @@ pushing to ../c
 searching for changes
 abort: push creates new remote branches!
 (did you forget to merge? use push -f to force)
+0
 pushing to ../c
 searching for changes
 no changes found
+0
 pushing to ../c
 searching for changes
 abort: push creates new remote branches!
 (did you forget to merge? use push -f to force)
+0
+pushing to ../c
+searching for changes
+abort: push creates new remote branches!
+(did you forget to merge? use push -f to force)
+0
 pushing to ../c
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 2 changesets with 2 changes to 1 files (+2 heads)
+0
 pushing to ../c
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (-1 heads)
+0