Mercurial > hg
annotate tests/test-imerge.out @ 7249:671b3e1eac2e
test-init: add test with format.usefncache=false
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Mon, 27 Oct 2008 13:22:45 +0100 |
parents | bbfebf751ac8 |
children |
rev | line source |
---|---|
5044 | 1 adding bar |
2 adding foo | |
5109 | 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 | 5 % start imerge |
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
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 | 9 foo |
10 bar | |
11 bar | |
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 | 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 | 16 % next |
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 | 24 % merge next |
5109 | 25 merging foo and foo2 |
5044 | 26 all conflicts resolved |
27 % unresolve | |
28 % merge foo | |
5109 | 29 merging foo and foo2 |
5044 | 30 all conflicts resolved |
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 | 46 % load |
5109 | 47 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5044 | 48 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
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 | 52 all conflicts resolved |
53 foo | |
5109 | 54 changeset: 3:fa9a6defdcaf |
5044 | 55 tag: tip |
56 parent: 2:e6da46716401 | |
5109 | 57 parent: 1:30d266f502e7 |
5044 | 58 user: test |
59 date: Thu Jan 01 00:00:03 1970 +0000 | |
5109 | 60 files: foo foo2 |
5044 | 61 description: |
62 merged | |
63 | |
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 | 68 % nothing to merge |
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 |