Mercurial > hg

annotate tests/test-imerge.out @ 7662:8aa338cd0df3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update mercurial.ini file packaged in win32 installer Update contrib/win32/mercurial.ini file with contrib/sample.hgrc content and append contrib/mergetools.hgrc content during installation
author Pascal Quantin <pascal.quantin@wavecom.com>
date Sat, 17 Jan 2009 15:23:13 +0100
parents bbfebf751ac8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5044
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
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6228
diff changeset
4 created new head
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
5 % start imerge
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
6 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
7 (branch merge, don't forget to commit)
5111
12930b97a729 imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents: 5109
diff changeset
8 U foo
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
9 foo
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
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
12 bar
5111
12930b97a729 imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents: 5109
diff changeset
13 % status -v
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
14 merging e6da46716401 and 30d266f502e7
5111
12930b97a729 imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents: 5109
diff changeset
15 U foo (foo2)
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
16 % next
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
17 foo
6363
bbfebf751ac8 test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents: 6362
diff changeset
18 % resolve and unresolve
bbfebf751ac8 test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents: 6362
diff changeset
19 merging e6da46716401 and 30d266f502e7
bbfebf751ac8 test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents: 6362
diff changeset
20 R foo (foo2)
bbfebf751ac8 test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents: 6362
diff changeset
21 all conflicts resolved
bbfebf751ac8 test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents: 6362
diff changeset
22 merging e6da46716401 and 30d266f502e7
bbfebf751ac8 test-imerge: test resolve subcommand
Patrick Mezard <pmezard@gmail.com>
parents: 6362
diff changeset
23 U foo (foo2)
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
24 % merge next
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
25 merging foo and foo2
5044
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 % unresolve
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
28 % merge foo
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
29 merging foo and foo2
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
30 all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
31 % save
6362
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
32 % merge auto
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
33 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
34 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
35 (branch merge, don't forget to commit)
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
36 merging foo2 and foo
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
37 warning: conflicts during merge.
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
38 merging foo2 failed!
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
39 U foo2
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
40 foo
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
41 <<<<<<< local
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
42 foo
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
43 =======
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
44 bar
bc3dbdb1d430 imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents: 6336
diff changeset
45 >>>>>>> other
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
46 % load
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
47 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
48 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
49 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
50 (branch merge, don't forget to commit)
5111
12930b97a729 imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents: 5109
diff changeset
51 R foo
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
52 all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
53 foo
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
54 changeset: 3:fa9a6defdcaf
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
55 tag: tip
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
56 parent: 2:e6da46716401
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
57 parent: 1:30d266f502e7
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
58 user: test
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
59 date: Thu Jan 01 00:00:03 1970 +0000
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset
60 files: foo foo2
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
61 description:
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
62 merged
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
63
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
64
5242
9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5111
diff changeset
65 % nothing to merge -- tip
9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5111
diff changeset
66 abort: there is nothing to merge
9cd6578750b9 improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 5111
diff changeset
67 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
68 % nothing to merge
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
69 abort: there is nothing to merge - use "hg update" instead
6213
5c5e45766224 imerge: Fix unbound name error and add a test case
Joel Rosdahl <joel@rosdahl.net>
parents: 5242
diff changeset
70 % load unknown parent
6228
c0c4c7b1e8d3 revlog: report node and file when lookup fails
Matt Mackall <mpm@selenic.com>
parents: 6213
diff changeset
71 abort: merge parent e6da46716401 not in repository