Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-imerge.out @ 5197:55860a45bbf2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enable demandimport only in scripts, not in importable modules (issue605) This way other applications can choose if and when they want this feature, because it might be problematic if those applications rely on ImportError.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 18 Aug 2007 11:37:08 +0200
parents 12930b97a729
children 9cd6578750b9
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)
5065
12930b97a729 imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents: 5063
diff changeset
7 U foo
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
8 foo
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
9 bar
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
10 bar
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
11 bar
5065
12930b97a729 imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents: 5063
diff changeset
12 % status -v
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
13 merging e6da46716401 and 30d266f502e7
5065
12930b97a729 imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents: 5063
diff changeset
14 U foo (foo2)
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
15 % next
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
16 foo
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
17 % merge next
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
18 merging foo and foo2
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
19 all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
20 % unresolve
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
21 % merge foo
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
22 merging foo and foo2
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
23 all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
24 % save
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
25 % load
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
26 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
27 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
28 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
29 (branch merge, don't forget to commit)
5065
12930b97a729 imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents: 5063
diff changeset
30 R foo
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
31 all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
32 foo
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
33 changeset: 3:fa9a6defdcaf
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
34 tag: tip
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
35 parent: 2:e6da46716401
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
36 parent: 1:30d266f502e7
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
37 user: test
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
38 date: Thu Jan 01 00:00:03 1970 +0000
5063
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5042
diff changeset
39 files: foo foo2
5042
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
40 description:
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
41 merged
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
42
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
43
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
44 % nothing to merge
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
45 abort: there is nothing to merge - use "hg update" instead