Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-imerge.out @ 5063:86327d13d916

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: handle renames
author Brendan Cully <brendan@kublai.com>
date Fri, 03 Aug 2007 18:05:20 -0700
parents 58006f8b8275
children 12930b97a729
comparison
equal deleted inserted replaced
5054:ec70fd08e16c 5063:86327d13d916
1 adding bar 1 adding bar
2 adding foo 2 adding foo
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
4 % start imerge 4 % start imerge
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 (branch merge, don't forget to commit) 6 (branch merge, don't forget to commit)
7 merging e6da46716401 and 1c0a86e7db0d 7 merging e6da46716401 and 30d266f502e7
8 remaining: 8 remaining:
9 foo 9 foo (foo2)
10 foo 10 foo
11 bar 11 bar
12 bar 12 bar
13 bar 13 bar
14 % status 14 % status
15 merging e6da46716401 and 1c0a86e7db0d 15 merging e6da46716401 and 30d266f502e7
16 remaining: 16 remaining:
17 foo 17 foo (foo2)
18 % next
19 foo
18 % merge next 20 % merge next
19 merging foo 21 merging foo and foo2
20 all conflicts resolved 22 all conflicts resolved
21 % unresolve 23 % unresolve
22 % merge foo 24 % merge foo
23 merging foo 25 merging foo and foo2
24 all conflicts resolved 26 all conflicts resolved
25 % save 27 % save
26 % load 28 % load
27 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 29 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
28 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 30 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
30 (branch merge, don't forget to commit) 32 (branch merge, don't forget to commit)
31 merging e6da46716401 and 1c0a86e7db0d 33 merging e6da46716401 and 30d266f502e7
32 resolved: 34 resolved:
33 foo 35 foo
34 all conflicts resolved 36 all conflicts resolved
35 foo 37 foo
36 changeset: 3:eaf80a943462 38 changeset: 3:fa9a6defdcaf
37 tag: tip 39 tag: tip
38 parent: 2:e6da46716401 40 parent: 2:e6da46716401
39 parent: 1:1c0a86e7db0d 41 parent: 1:30d266f502e7
40 user: test 42 user: test
41 date: Thu Jan 01 00:00:03 1970 +0000 43 date: Thu Jan 01 00:00:03 1970 +0000
42 files: foo 44 files: foo foo2
43 description: 45 description:
44 merged 46 merged
45 47
46 48
47 % nothing to merge 49 % nothing to merge