Mercurial > hg
annotate tests/test-merge-local.out @ 10592:1875dc1ac5f4 stable
Added tag 1.5 for changeset ff2704a8ded3
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 05 Mar 2010 18:26:12 -0600 |
parents | a964ab624385 |
children | 6f1894d6a6b0 |
rev | line source |
---|---|
3869
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
1 # revision 0 |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
2 adding copy |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
3 adding move |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
4 adding remove |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
5 adding unchanged |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
6 adding zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
7 adding zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
8 # revision 1 |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
9 # local changes to revision 0 |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
10 4 files updated, 0 files merged, 3 files removed, 0 files unresolved |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
11 --- a/zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
12 +++ b/zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
13 +new last line |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
14 --- a/zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
15 +++ b/zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
16 +another last line |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
17 M zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
18 M zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
19 # local merge with bad merge tool |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
20 merging zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
21 merging zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
22 merging zzz2_merge_bad failed! |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
4417
diff
changeset
|
23 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
6518 | 24 use 'hg resolve' to retry unresolved file merges |
8742
a964ab624385
merge: allow merging going backwards
Matt Mackall <mpm@selenic.com>
parents:
6518
diff
changeset
|
25 merging zzz1_merge_ok |
a964ab624385
merge: allow merging going backwards
Matt Mackall <mpm@selenic.com>
parents:
6518
diff
changeset
|
26 merging zzz2_merge_bad |
a964ab624385
merge: allow merging going backwards
Matt Mackall <mpm@selenic.com>
parents:
6518
diff
changeset
|
27 2 files updated, 2 files merged, 3 files removed, 0 files unresolved |
3869
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
28 --- a/zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
29 +++ b/zzz1_merge_ok |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
4417
diff
changeset
|
30 +new first line |
3869
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
31 +new last line |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
32 --- a/zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
33 +++ b/zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
34 +another last line |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
35 M zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
36 M zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
37 # local merge with conflicts |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
38 merging zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
39 merging zzz2_merge_bad |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
4417
diff
changeset
|
40 warning: conflicts during merge. |
3869
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
41 merging zzz2_merge_bad failed! |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
42 3 files updated, 1 files merged, 2 files removed, 1 files unresolved |
6518 | 43 use 'hg resolve' to retry unresolved file merges |
8742
a964ab624385
merge: allow merging going backwards
Matt Mackall <mpm@selenic.com>
parents:
6518
diff
changeset
|
44 merging zzz1_merge_ok |
a964ab624385
merge: allow merging going backwards
Matt Mackall <mpm@selenic.com>
parents:
6518
diff
changeset
|
45 merging zzz2_merge_bad |
a964ab624385
merge: allow merging going backwards
Matt Mackall <mpm@selenic.com>
parents:
6518
diff
changeset
|
46 2 files updated, 2 files merged, 3 files removed, 0 files unresolved |
3869
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
47 --- a/zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
48 +++ b/zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
49 +new first line |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
50 +new last line |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
51 --- a/zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
52 +++ b/zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
53 +another last line |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
54 +======= |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
55 +new last line |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
56 M zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
57 M zzz2_merge_bad |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
58 # local merge without conflicts |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
59 merging zzz1_merge_ok |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
60 4 files updated, 1 files merged, 2 files removed, 0 files unresolved |
3869
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
61 --- a/zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
62 +++ b/zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
63 +new last line |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
64 M zzz1_merge_ok |
ad6f34c83c3d
Add instructions how to redo/finish failed merge with local working directory.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
65 ? zzz2_merge_bad.orig |