author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
Sat, 25 Aug 2007 11:30:59 +0200 | |
changeset 5225 | 423f4e8be115 |
parent 5224 | 9cd6578750b9 |
permissions | -rw-r--r-- |
5042 | 1 |
adding bar |
2 |
adding foo |
|
5063 | 3 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5042 | 4 |
% start imerge |
5 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
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 | 8 |
foo |
9 |
bar |
|
10 |
bar |
|
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 | 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 | 15 |
% next |
16 |
foo |
|
5042 | 17 |
% merge next |
5063 | 18 |
merging foo and foo2 |
5042 | 19 |
all conflicts resolved |
20 |
% unresolve |
|
21 |
% merge foo |
|
5063 | 22 |
merging foo and foo2 |
5042 | 23 |
all conflicts resolved |
24 |
% save |
|
25 |
% load |
|
5063 | 26 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5042 | 27 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
28 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
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 | 31 |
all conflicts resolved |
32 |
foo |
|
5063 | 33 |
changeset: 3:fa9a6defdcaf |
5042 | 34 |
tag: tip |
35 |
parent: 2:e6da46716401 |
|
5063 | 36 |
parent: 1:30d266f502e7 |
5042 | 37 |
user: test |
38 |
date: Thu Jan 01 00:00:03 1970 +0000 |
|
5063 | 39 |
files: foo foo2 |
5042 | 40 |
description: |
41 |
merged |
|
42 |
||
43 |
||
5224
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5065
diff
changeset
|
44 |
% nothing to merge -- tip |
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5065
diff
changeset
|
45 |
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:
5065
diff
changeset
|
46 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5042 | 47 |
% nothing to merge |
48 |
abort: there is nothing to merge - use "hg update" instead |