Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-imerge.out
author Matt Mackall <mpm@selenic.com>
Tue, 11 Mar 2008 17:42:29 -0500
changeset 6228 c0c4c7b1e8d3
parent 6213 5c5e45766224
child 6336 4b0c9c674707
permissions -rw-r--r--
revlog: report node and file when lookup fails
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     4
 
% start imerge
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     5
 
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 
     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
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     8
 
foo
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
     9
 
bar
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
5111
12930b97a729 imerge: gussy up dispatcher to support subcommand opts.
Brendan Cully <brendan@kublai.com>
parents: 5109
diff changeset 
    12
 
% status -v
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset 
    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
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset 
    15
 
% next
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset 
    16
 
foo
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    17
 
% merge next
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset 
    18
 
merging foo and foo2
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    19
 
all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    20
 
% unresolve
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    21
 
% merge foo
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset 
    22
 
merging foo and foo2
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    23
 
all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    24
 
% save
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    25
 
% load
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset 
    26
 
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 
    27
 
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 
    28
 
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 
    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
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    31
 
all conflicts resolved
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    32
 
foo
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset 
    33
 
changeset:   3:fa9a6defdcaf
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    34
 
tag:         tip
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    35
 
parent:      2:e6da46716401
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset 
    36
 
parent:      1:30d266f502e7
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    37
 
user:        test
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    38
 
date:        Thu Jan 01 00:00:03 1970 +0000
5109
86327d13d916 imerge: handle renames
Brendan Cully <brendan@kublai.com>
parents: 5044
diff changeset 
    39
 
files:       foo foo2
5044
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    40
 
description:
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    41
 
merged
58006f8b8275 imerge extension and test
Brendan Cully <brendan@kublai.com>
parents:
diff changeset 
    42
 












58006f8b8275
imerge extension and test



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    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






58006f8b8275
imerge extension and test



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    47


% nothing to merge













58006f8b8275
imerge extension and test



Brendan Cully <brendan@kublai.com>


parents: 

diff
changeset




    48


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




    49


% load unknown parent








6228






c0c4c7b1e8d3
revlog: report node and file when lookup fails



Matt Mackall <mpm@selenic.com>


parents: 
6213

diff
changeset




    50


abort: merge parent e6da46716401 not in repository















Mercurial