Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-push-warn.out @ 925:5a034646e472

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
924:ab681ea2857e 925:5a034646e472
1 + hg init
2 + hg add t1
3 + hg commit -m 1 -d 0 0
4 + hg clone a b
5 + hg add t2
6 + hg commit -m 2 -d 0 0
7 + hg add t3
8 + hg commit -m 3 -d 0 0
9 + hg push ../a
10 pushing to ../a 1 pushing to ../a
11 searching for changes 2 searching for changes
12 abort: unsynced remote changes! 3 abort: unsynced remote changes!
13 (did you forget to sync? use push -f to force) 4 (did you forget to sync? use push -f to force)
14 + hg pull ../a
15 pulling from ../a 5 pulling from ../a
16 searching for changes 6 searching for changes
17 adding changesets 7 adding changesets
18 adding manifests 8 adding manifests
19 adding file changes 9 adding file changes
20 added 1 changesets with 1 changes to 1 files 10 added 1 changesets with 1 changes to 1 files
21 (run 'hg update' to get a working copy) 11 (run 'hg update' to get a working copy)
22 + hg push ../a
23 pushing to ../a 12 pushing to ../a
24 searching for changes 13 searching for changes
25 abort: push creates new remote branches! 14 abort: push creates new remote branches!
26 (did you forget to merge? use push -f to force) 15 (did you forget to merge? use push -f to force)
27 + hg up -m
28 + hg commit -m 4 -d 0 0
29 + hg push ../a
30 pushing to ../a 16 pushing to ../a
31 searching for changes 17 searching for changes
32 adding changesets 18 adding changesets
33 adding manifests 19 adding manifests
34 adding file changes 20 adding file changes