Mercurial > hg

annotate tests/test-merge9.out @ 6914:95f35b553ae6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: removed unnecessary del before function return Deleting tmpl just before the return statement should have no effect since tmpl goes out of scope anyway. But it confuses pyflakes who thinks tmpl is undefined when it is used in the except blocks below.
author Martin Geisler <mg@daimi.au.dk>
date Sat, 16 Aug 2008 16:32:57 +0200
parents 92ccccb55ba3
children 5a14a8f3b909
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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
6518
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
10 use 'hg resolve' to retry unresolved file merges
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
6518
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
18 use 'hg resolve' to retry unresolved file merges
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
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
26 % re-resolve baz
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
27 merging baz and foo to baz
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
28 % after
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
29 U bar
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
30 R baz
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
31 % resolve all
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
32 merging bar
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
33 warning: conflicts during merge.
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
34 merging bar failed!
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
35 % after
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
36 U bar
92ccccb55ba3 resolve: new command
Matt Mackall <mpm@selenic.com>
parents: 6512
diff changeset
37 R baz