diff tests/test-ssh.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 8770b4870e22
children c0b449154a90
line wrap: on
line diff
--- a/tests/test-ssh.out	Sun Nov 19 16:32:36 2006 -0600
+++ b/tests/test-ssh.out	Sun Nov 19 16:32:36 2006 -0600
@@ -68,14 +68,10 @@
 checking files
 1 files, 2 changesets, 2 total revisions
 bleah
-# push should fail
-pushing to ssh://user@dummy/remote
-searching for changes
-abort: unsynced remote changes!
-(did you forget to sync? use push -f to force)
 # push should succeed
 pushing to ssh://user@dummy/remote
 searching for changes
+note: unsynced remote changes!
 remote: adding changesets
 remote: adding manifests
 remote: adding file changes
@@ -89,5 +85,4 @@
 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
 changegroup in remote: u=remote:ssh:127.0.0.1
 Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
-Got arguments 1:user@dummy 2:hg -R remote serve --stdio 3: 4: 5:
 changegroup in remote: u=remote:ssh:127.0.0.1