Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-push-warn.out @ 3684:975c2469c316
correct remote heads test in prepush
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 19 Nov 2006 16:32:36 -0600 |
parents | 092039246d73 |
children | 2aef481ac73c |
line wrap: on
line diff
--- a/tests/test-push-warn.out +++ b/tests/test-push-warn.out @@ -1,8 +1,8 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved pushing to ../a searching for changes -abort: unsynced remote changes! -(did you forget to sync? use push -f to force) +abort: push creates new remote branches! +(did you forget to merge? use push -f to force) pulling from ../a searching for changes adding changesets @@ -38,6 +38,10 @@ searching for changes no changes found pushing to ../c searching for changes +abort: push creates new remote branches! +(did you forget to merge? use push -f to force) +pushing to ../c +searching for changes adding changesets adding manifests adding file changes