Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-push-warn.out @ 838:0fc4b1ab57e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with Matt.
author Bryan O'Sullivan <bos@serpentine.com>
date Thu, 04 Aug 2005 05:14:59 -0800
parents 8674b7803714
children 9c918287d10b
comparison
equal deleted inserted replaced
837:a95c9b3fc3bf 838:0fc4b1ab57e3
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
11 searching for changes
12 abort: unsynced remote changes!
13 (did you forget to sync? use push -f to force)
14 + hg pull ../a
15 pulling from ../a
16 searching for changes
17 adding changesets
18 adding manifests
19 adding file changes
20 added 1 changesets with 1 changes to 1 files
21 (run 'hg update' to get a working copy)
22 + hg push ../a
23 pushing to ../a
24 searching for changes
25 abort: push creates new remote branches!
26 (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
31 searching for changes
32 adding changesets
33 adding manifests
34 adding file changes
35 added 2 changesets with 2 changes to 2 files