Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-push-warn.out @ 925:5a034646e472
run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
author | mpm@selenic.com |
---|---|
date | Tue, 16 Aug 2005 19:03:01 -0800 |
parents | 9c918287d10b |
children | 5007e0bdeed2 |
line wrap: on
line diff
--- 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