Mercurial > hg
annotate tests/test-imerge.out @ 6109:242595e612ed
revert: unify forget and remove lists
This doesn't make a difference right now, but after the next revision
some files in state 'a' may end up in the deleted list, and revert
won't be able to just remove all files in that list.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 14 Feb 2008 18:08:16 -0200 |
parents | 9cd6578750b9 |
children | 5c5e45766224 |
rev | line source |
---|---|
5044 | 1 adding bar |
2 adding foo | |
5109 | 3 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5044 | 4 % start imerge |
5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
6 (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
|
7 U foo |
5044 | 8 foo |
9 bar | |
10 bar | |
11 bar | |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5109
diff
changeset
|
12 % status -v |
5109 | 13 merging e6da46716401 and 30d266f502e7 |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5109
diff
changeset
|
14 U foo (foo2) |
5109 | 15 % next |
16 foo | |
5044 | 17 % merge next |
5109 | 18 merging foo and foo2 |
5044 | 19 all conflicts resolved |
20 % unresolve | |
21 % merge foo | |
5109 | 22 merging foo and foo2 |
5044 | 23 all conflicts resolved |
24 % save | |
25 % load | |
5109 | 26 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5044 | 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) | |
5111
12930b97a729
imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents:
5109
diff
changeset
|
30 R foo |
5044 | 31 all conflicts resolved |
32 foo | |
5109 | 33 changeset: 3:fa9a6defdcaf |
5044 | 34 tag: tip |
35 parent: 2:e6da46716401 | |
5109 | 36 parent: 1:30d266f502e7 |
5044 | 37 user: test |
38 date: Thu Jan 01 00:00:03 1970 +0000 | |
5109 | 39 files: foo foo2 |
5044 | 40 description: |
41 merged | |
42 | |
43 | |
5242
9cd6578750b9
improve error message for 'hg merge' when repo already at branchtip
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5111
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:
5111
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:
5111
diff
changeset
|
46 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
5044 | 47 % nothing to merge |
48 abort: there is nothing to merge - use "hg update" instead |