author | Patrick Mezard <pmezard@gmail.com> |
Sun, 23 Mar 2008 20:37:02 +0100 | |
changeset 6362 | bc3dbdb1d430 |
parent 6336 | 4b0c9c674707 |
child 6363 | bbfebf751ac8 |
permissions | -rw-r--r-- |
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 |
|
5044 | 18 |
% merge next |
5109 | 19 |
merging foo and foo2 |
5044 | 20 |
all conflicts resolved |
21 |
% unresolve |
|
22 |
% merge foo |
|
5109 | 23 |
merging foo and foo2 |
5044 | 24 |
all conflicts resolved |
25 |
% save |
|
6362
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
26 |
% merge auto |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
27 |
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
|
28 |
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
|
29 |
(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
|
30 |
merging foo2 and foo |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
31 |
warning: conflicts during merge. |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
32 |
merging foo2 failed! |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
33 |
U foo2 |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
34 |
foo |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
35 |
<<<<<<< local |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
36 |
foo |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
37 |
======= |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
38 |
bar |
bc3dbdb1d430
imerge: replace "merge" with "internal:merge" when non-interactive
Patrick Mezard <pmezard@gmail.com>
parents:
6336
diff
changeset
|
39 |
>>>>>>> other |
5044 | 40 |
% load |
5109 | 41 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5044 | 42 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
43 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
44 |
(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
|
45 |
R foo |
5044 | 46 |
all conflicts resolved |
47 |
foo |
|
5109 | 48 |
changeset: 3:fa9a6defdcaf |
5044 | 49 |
tag: tip |
50 |
parent: 2:e6da46716401 |
|
5109 | 51 |
parent: 1:30d266f502e7 |
5044 | 52 |
user: test |
53 |
date: Thu Jan 01 00:00:03 1970 +0000 |
|
5109 | 54 |
files: foo foo2 |
5044 | 55 |
description: |
56 |
merged |
|
57 |
||
58 |
||
5242
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
diff
changeset
|
59 |
% 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
|
60 |
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
|
61 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5044 | 62 |
% nothing to merge |
63 |
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
|
64 |
% load unknown parent |
6228
c0c4c7b1e8d3
revlog: report node and file when lookup fails
Matt Mackall <mpm@selenic.com>
parents:
6213
diff
changeset
|
65 |
abort: merge parent e6da46716401 not in repository |