Mercurial > hg > mercurial-crew-with-dirclash

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
1 adding bar
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
2 adding foo
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
4 % start imerge
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
6 (branch merge, don't forget to commit)
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
7 merging e6da46716401 and 30d266f502e7
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
8 remaining:
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
9 foo (foo2)
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
10 foo
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
11 bar
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
12 bar
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
13 bar
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
14 % status
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
15 merging e6da46716401 and 30d266f502e7
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
16 remaining:
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
17 foo (foo2)
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
18 % next
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
19 foo
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
20 % merge next
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
21 merging foo and foo2
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
22 all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
23 % unresolve
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
24 % merge foo
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
25 merging foo and foo2
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
26 all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
27 % save
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
28 % load
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
29 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
30 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
31 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
32 (branch merge, don't forget to commit)
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
33 merging e6da46716401 and 30d266f502e7
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
34 resolved:
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
35 foo
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
36 all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
37 foo
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
38 changeset: 3:fa9a6defdcaf
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
39 tag: tip
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
40 parent: 2:e6da46716401
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
41 parent: 1:30d266f502e7
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
42 user: test
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
43 date: Thu Jan 01 00:00:03 1970 +0000
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
44 files: foo foo2
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
45 description:
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
46 merged
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
47
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
48
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
49 % nothing to merge
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
50 abort: there is nothing to merge - use "hg update" instead