Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-imerge.out @ 5344:cc34be74eeec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable.
author Bryan O'Sullivan <bos@serpentine.com>
date Sat, 29 Sep 2007 21:10:54 -0700
parents 9cd6578750b9
children
comparison
equal deleted inserted replaced
5343:26692d08c2f9 5344:cc34be74eeec
1 adding bar
2 adding foo
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4 % start imerge
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 (branch merge, don't forget to commit)
7 U foo
8 foo
9 bar
10 bar
11 bar
12 % status -v
13 merging e6da46716401 and 30d266f502e7
14 U foo (foo2)
15 % next
16 foo
17 % merge next
18 merging foo and foo2
19 all conflicts resolved
20 % unresolve
21 % merge foo
22 merging foo and foo2
23 all conflicts resolved
24 % save
25 % load
26 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
27 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 (branch merge, don't forget to commit)
30 R foo
31 all conflicts resolved
32 foo
33 changeset: 3:fa9a6defdcaf
34 tag: tip
35 parent: 2:e6da46716401
36 parent: 1:30d266f502e7
37 user: test
38 date: Thu Jan 01 00:00:03 1970 +0000
39 files: foo foo2
40 description:
41 merged
42
43
44 % nothing to merge -- tip
45 abort: there is nothing to merge
46 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
47 % nothing to merge
48 abort: there is nothing to merge - use "hg update" instead