diff --git a/tests/test-push-warn.out b/tests/test-push-warn.out --- a/tests/test-push-warn.out +++ b/tests/test-push-warn.out @@ -1,17 +1,7 @@ -+ 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 @@ -19,14 +9,10 @@ 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