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-merge9.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Mon, 14 Dec 2009 00:32:29 +0900
changeset 10111 27457d31ae3f
parent 9468 b2310903c462
permissions -rw-r--r--
cmdutil: replace sys.maxint with None as default value in loglimit Semantically, it is better to use None over any other value when there is "no value". Using maxint in this context is quite hackish, and is not forward compatible.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
4682
dc5920ea12f8 merge: fix small bug with a failed merge across a rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
adding bar
dc5920ea12f8 merge: fix small bug with a failed merge across a rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
adding foo
dc5920ea12f8 merge: fix small bug with a failed merge across a rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
adding quux1
dc5920ea12f8 merge: fix small bug with a failed merge across a rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
adding quux2
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset 
     5
 
created new head
4682
dc5920ea12f8 merge: fix small bug with a failed merge across a rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
merging bar
dc5920ea12f8 merge: fix small bug with a failed merge across a rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 
merging bar failed!
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
     8
 
merging foo and baz to baz
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset 
     9
 
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
9468
b2310903c462 hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents: 7847
diff changeset 
    10
 
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
6518
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    11
 
U bar
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    12
 
R baz
4682
dc5920ea12f8 merge: fix small bug with a failed merge across a rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    13
 
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
dc5920ea12f8 merge: fix small bug with a failed merge across a rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    14
 
merging bar
dc5920ea12f8 merge: fix small bug with a failed merge across a rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    15
 
merging bar failed!
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset 
    16
 
merging baz and foo to baz
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5042
diff changeset 
    17
 
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
9468
b2310903c462 hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents: 7847
diff changeset 
    18
 
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
6518
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    19
 
% show unresolved
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    20
 
U bar
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    21
 
R baz
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    22
 
% unmark baz
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    23
 
% show
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    24
 
U bar
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    25
 
U baz
7847
30cb79d84352 resolve: keep .orig files
Matt Mackall <mpm@selenic.com>
parents: 7821
diff changeset 
    26
 
M bar
30cb79d84352 resolve: keep .orig files
Matt Mackall <mpm@selenic.com>
parents: 7821
diff changeset 
    27
 
M baz
30cb79d84352 resolve: keep .orig files
Matt Mackall <mpm@selenic.com>
parents: 7821
diff changeset 
    28
 
M quux2
30cb79d84352 resolve: keep .orig files
Matt Mackall <mpm@selenic.com>
parents: 7821
diff changeset 
    29
 
? bar.orig
6518
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    30
 
% re-resolve baz
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    31
 
merging baz and foo to baz
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    32
 
% after
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    33
 
U bar
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    34
 
R baz
7527
5a14a8f3b909 resolve: require -a switch to resolve all files
Matt Mackall <mpm@selenic.com>
parents: 6518
diff changeset 
    35
 
% resolve all warning
5a14a8f3b909 resolve: require -a switch to resolve all files
Matt Mackall <mpm@selenic.com>
parents: 6518
diff changeset 
    36
 
abort: no files or directories specified; use --all to remerge all files
6518
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    37
 
% resolve all
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    38
 
merging bar
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    39
 
warning: conflicts during merge.
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    40
 
merging bar failed!
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    41
 
% after
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    42
 
U bar
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset 
    43
 
R baz
Mercurial