diff tests/test-push-warn.out @ 6181:d500aeb8092e

warning on push should mention heads, not branches This makes the concept easier to relate to similar messages given on pull, and allows for a distinction between heads and (named) branches.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 28 Feb 2008 17:51:04 +0100
parents 65340b8231eb
children 4b0c9c674707
line wrap: on
line diff
--- a/tests/test-push-warn.out	Thu Feb 28 00:07:38 2008 +0100
+++ b/tests/test-push-warn.out	Thu Feb 28 17:51:04 2008 +0100
@@ -1,7 +1,7 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to ../a
 searching for changes
-abort: push creates new remote branches!
+abort: push creates new remote heads!
 (did you forget to merge? use push -f to force)
 pulling from ../a
 searching for changes
@@ -12,7 +12,7 @@
 (run 'hg heads' to see heads, 'hg merge' to merge)
 pushing to ../a
 searching for changes
-abort: push creates new remote branches!
+abort: push creates new remote heads!
 (did you forget to merge? use push -f to force)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
@@ -31,7 +31,7 @@
 (branch merge, don't forget to commit)
 pushing to ../c
 searching for changes
-abort: push creates new remote branches!
+abort: push creates new remote heads!
 (did you forget to merge? use push -f to force)
 1
 pushing to ../c
@@ -40,12 +40,12 @@
 0
 pushing to ../c
 searching for changes
-abort: push creates new remote branches!
+abort: push creates new remote heads!
 (did you forget to merge? use push -f to force)
 1
 pushing to ../c
 searching for changes
-abort: push creates new remote branches!
+abort: push creates new remote heads!
 (did you forget to merge? use push -f to force)
 1
 pushing to ../c