annotate tests/test-rename-merge2.out @ 7981:20df260ae301

commands: clarify push help text
author Martin Geisler <mg@daimi.au.dk>
date Sat, 04 Apr 2009 18:03:03 +0200
parents 5bf5fd1e2a74
children f325574dad1a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
1 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 test L:up a R:nc a b W: - 1 get local a to b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
6 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
7 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
8 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
9 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
10 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
11 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
12 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
13 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
14 rev: versions differ -> m
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
15 a: remote copied to b -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
16 preserving a for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
17 preserving rev for resolve of rev
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
18 picked tool 'python ../merge' for b (binary False symlink False)
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
19 merging a and b to b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
20 my b@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
21 premerge successful
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
22 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
23 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
24 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
25 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
26 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
27 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
28 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
29 a
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
30 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
31 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
32
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
33 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
34 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
35 test L:nc a b R:up a W: - 2 get rem change to a and b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
36 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
37 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
38 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
39 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
40 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
41 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
42 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
43 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
44 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
45 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
46 a: remote is newer -> g
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
47 b: local copied to a -> m
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
48 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
49 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
50 preserving rev for resolve of rev
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
51 getting a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
52 picked tool 'python ../merge' for b (binary False symlink False)
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
53 merging b and a to b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
54 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
55 premerge successful
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
56 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
57 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
58 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
59 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
60 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
61 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
62 M a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
63 M b
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3282
diff changeset
64 a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
65 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
66
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
67 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
68 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
69 test L:up a R:nm a b W: - 3 get local a change to b, remove a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
70 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
71 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
72 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
73 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
74 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
75 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
76 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
77 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
78 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
79 checking for directory renames
3730
d377f8d25662 merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
80 rev: versions differ -> m
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
81 a: remote moved to b -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
82 preserving a for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
83 preserving rev for resolve of rev
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
84 removing a
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
85 picked tool 'python ../merge' for b (binary False symlink False)
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
86 merging a and b to b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
87 my b@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
88 premerge successful
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
89 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
90 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
91 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
92 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
93 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
94 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
95 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
96 a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
97 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
98
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
99 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
100 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
101 test L:nm a b R:up a W: - 4 get remote change to b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
102 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
103 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
104 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
105 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
106 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
107 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
108 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
109 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
110 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
111 checking for directory renames
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
112 b: local moved to a -> m
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
113 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
114 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
115 preserving rev for resolve of rev
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
116 picked tool 'python ../merge' for b (binary False symlink False)
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
117 merging b and a to b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
118 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
119 premerge successful
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
120 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
121 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
122 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
123 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
124 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
125 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
126 M b
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3282
diff changeset
127 a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
128 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
129
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
130 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
131 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
132 test L: R:nc a b W: - 5 get b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
133 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
134 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
135 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
136 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
137 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
138 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
139 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
140 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
141 b -> a
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
142 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
143 rev: versions differ -> m
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
144 b: remote created -> g
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
145 preserving rev for resolve of rev
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
146 getting b
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
147 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
148 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
149 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337
3400
d2b55e3c4e25 merge: if filemerge skips merge, report as updated
Matt Mackall <mpm@selenic.com>
parents: 3314
diff changeset
150 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
151 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
152 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
153 M b
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
154 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
155 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
156
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
157 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
158 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
159 test L:nc a b R: W: - 6 nothing
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
160 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
161 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
162 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
163 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
164 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
165 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
166 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
167 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
168 b -> a
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
169 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
170 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
171 preserving rev for resolve of rev
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
172 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
173 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
174 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
175 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
176 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
177 --------------
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
178 C a
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
179 C b
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
180 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
181
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
182 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
183 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
184 test L: R:nm a b W: - 7 get b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
185 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
186 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
187 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
188 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
189 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
190 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
191 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
192 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
193 b -> a
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
194 checking for directory renames
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
195 a: other deleted -> r
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
196 rev: versions differ -> m
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
197 b: remote created -> g
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
198 preserving rev for resolve of rev
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
199 removing a
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
200 getting b
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
201 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
202 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
203 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
204 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
205 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
206 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
207 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
208 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
209
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
210 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
211 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
212 test L:nm a b R: W: - 8 nothing
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
213 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
214 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
215 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
216 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
217 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
218 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
219 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
220 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
221 b -> a
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
222 checking for directory renames
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
223 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
224 preserving rev for resolve of rev
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
225 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
226 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
227 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337
4416
bb1800a7d7e1 merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents: 4304
diff changeset
228 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
229 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
230 --------------
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
231 C b
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
232 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
233
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
234 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
235 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
236 test L:um a b R:um a b W: - 9 do merge with ancestor in a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
237 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
238 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
239 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
240 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
241 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
242 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
243 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
244 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
245 preserving rev for resolve of rev
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
246 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
247 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
248 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
249 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
250 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
251 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
252 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
253 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
254 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
255 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
256 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
257
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
258 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
259 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
260 test L:nm a b R:nm a c W: - 11 get c, keep b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
261 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
262 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
263 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
264 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
265 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
266 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
267 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
268 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
269 c
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
270 all copies found (* = to merge, ! = divergent):
5857
c704b03884ef merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents: 5764
diff changeset
271 c -> a !
c704b03884ef merge: add a bit more sanity to divergent copy checks
Matt Mackall <mpm@selenic.com>
parents: 5764
diff changeset
272 b -> a !
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
273 checking for directory renames
4674
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 4416
diff changeset
274 a: divergent renames -> dr
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
275 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
276 c: remote created -> g
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
277 preserving rev for resolve of rev
4674
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 4416
diff changeset
278 warning: detected divergent renames of a to:
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 4416
diff changeset
279 b
723e0ddb6ada merge: warn user about divergent renames
Matt Mackall <mpm@selenic.com>
parents: 4416
diff changeset
280 c
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
281 getting c
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
282 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
283 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
284 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
285 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
286 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
287 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
288 M c
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
289 C b
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
290 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
291
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
292 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
293 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
294 test L:nc a b R:up b W: - 12 merge b no ancestor
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
295 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
296 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
297 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
298 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
299 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
300 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
301 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
302 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
303 preserving rev for resolve of rev
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
304 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
305 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
306 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
307 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
308 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
309 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
310 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
311 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
312 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
313 M b
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
314 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
315 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
316
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
317 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
318 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
319 test L:up b R:nm a b W: - 13 merge b no ancestor
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
320 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
321 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
322 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
323 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
324 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
325 a: other deleted -> r
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
326 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
327 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
328 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
329 preserving rev for resolve of rev
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
330 removing a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
331 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
332 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
333 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
334 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
335 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
336 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
337 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
338 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
339 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
340 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
341 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
342
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
343 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
344 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
345 test L:nc a b R:up a b W: - 14 merge b no ancestor
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
346 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
347 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
348 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
349 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
350 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
351 a: remote is newer -> g
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
352 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
353 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
354 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
355 preserving rev for resolve of rev
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
356 getting a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
357 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
358 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
359 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
360 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
361 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
362 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
363 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
364 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
365 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
366 M a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
367 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
368 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
369
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
370 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
371 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
372 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
373 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
374 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
375 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
376 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
377 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
378 a: other deleted -> r
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
379 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
380 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
381 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
382 preserving rev for resolve of rev
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
383 removing a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
384 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
385 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
386 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
387 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
388 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
389 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
390 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
391 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
392 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
393 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
394 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
395
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
396 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
397 --------------
3281
f49c90b46897 Update test output
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
398 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
399 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
400 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
401 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
402 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
403 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
404 a: remote is newer -> g
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
405 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
406 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
407 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
408 preserving rev for resolve of rev
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
409 getting a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
410 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
411 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
412 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
413 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
414 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
415 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
416 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
417 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
418 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
419 M a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
420 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
421 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
422
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
423 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
424 --------------
3281
f49c90b46897 Update test output
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
425 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
426 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
427 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
428 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
429 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
430 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
431 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
432 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
433 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
434 preserving rev for resolve of rev
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
435 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
436 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
437 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
438 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
439 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
440 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
441 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
442 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
443 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
444 M b
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
445 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
446 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
447
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
448 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
449 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
450 test L:nm a b R:up a b W: - 18 merge b no ancestor
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
451 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
452 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
453 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
454 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
455 searching for copies back to rev 1
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
456 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
457 rev: versions differ -> m
7320
8dca507e56ce ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 6512
diff changeset
458 remote changed a which local deleted
8dca507e56ce ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 6512
diff changeset
459 use (c)hanged version or leave (d)eleted? c
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
460 a: prompt recreating -> g
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
461 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
462 preserving rev for resolve of rev
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
463 getting a
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
464 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
465 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
466 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
467 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
468 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
469 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
470 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
471 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
472 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
473 M a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
474 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
475 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
476
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
477 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
478 --------------
3281
f49c90b46897 Update test output
Matt Mackall <mpm@selenic.com>
parents: 3252
diff changeset
479 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
480 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
481 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
482 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
483 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
484 searching for copies back to rev 1
7320
8dca507e56ce ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 6512
diff changeset
485 local changed a which remote deleted
8dca507e56ce ui: log non-interactive default response to stdout when verbose
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents: 6512
diff changeset
486 use (c)hanged version or (d)elete? c
7768
5bf5fd1e2a74 merge: mark kept local files as readded on linear update (issue539)
Matt Mackall <mpm@selenic.com>
parents: 7320
diff changeset
487 a: prompt keep -> a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
488 b: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
489 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
490 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
491 preserving rev for resolve of rev
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
492 picked tool 'python ../merge' for b (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
493 merging b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
494 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
495 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
496 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
497 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
498 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
499 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
500 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
501 M b
5764
8a5d8fb59ed2 Backed out changeset c2a21fe60994
Matt Mackall <mpm@selenic.com>
parents: 5762
diff changeset
502 C a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
503 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
504
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
505 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
506 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
507 test L:up a R:um a b W: - 20 merge a and b to b, remove a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
508 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
509 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
510 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
511 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
512 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
513 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
514 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
515 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
516 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
517 checking for directory renames
3730
d377f8d25662 merge: only store one direction of copies in the copy map
Matt Mackall <mpm@selenic.com>
parents: 3727
diff changeset
518 rev: versions differ -> m
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
519 a: remote moved to b -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
520 preserving a for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
521 preserving rev for resolve of rev
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
522 removing a
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
523 picked tool 'python ../merge' for b (binary False symlink False)
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
524 merging a and b to b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
525 my b@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
526 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
527 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
528 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
529 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
530 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
531 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
532 M b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
533 a
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
534 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
535
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
536 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
537 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
538 test L:um a b R:up a W: - 21 merge a and b to b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
539 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
540 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
541 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
542 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
543 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
544 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
545 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
546 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
547 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
548 checking for directory renames
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
549 b: local moved to a -> m
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
550 rev: versions differ -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
551 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
552 preserving rev for resolve of rev
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
553 picked tool 'python ../merge' for b (binary False symlink False)
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
554 merging b and a to b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
555 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
556 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
557 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
558 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
559 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
560 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
561 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
562 M b
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3282
diff changeset
563 a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
564 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
565
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6004
diff changeset
566 created new head
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
567 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
568 test L:nm a b R:up a c W: - 23 get c, keep b
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
569 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
570 resolving manifests
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
571 overwrite None partial False
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
572 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
5387
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
573 searching for copies back to rev 1
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
574 unmatched files in local:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
575 b
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
576 unmatched files in other:
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
577 c
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
578 all copies found (* = to merge, ! = divergent):
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
579 b -> a *
4b6f0aa568e5 Update test for new output produced since 17ed9b9a0d03
Bryan O'Sullivan <bos@serpentine.com>
parents: 5042
diff changeset
580 checking for directory renames
3727
0fb66912040a merge: report destinations of moves in merge action messages
Matt Mackall <mpm@selenic.com>
parents: 3674
diff changeset
581 b: local moved to a -> m
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
582 rev: versions differ -> m
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
583 c: remote created -> g
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
584 preserving b for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
585 preserving rev for resolve of rev
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
586 picked tool 'python ../merge' for b (binary False symlink False)
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6336
diff changeset
587 merging b and a to b
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
588 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
589 premerge successful
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
590 getting c
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5857
diff changeset
591 picked tool 'python ../merge' for rev (binary False symlink False)
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
592 merging rev
3314
b16456909a0a merge: various tidying
Matt Mackall <mpm@selenic.com>
parents: 3311
diff changeset
593 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
594 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
595 (branch merge, don't forget to commit)
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
596 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
597 M b
3292
764688cf51e5 merge: remember rename copies and parents properly on commit
Matt Mackall <mpm@selenic.com>
parents: 3282
diff changeset
598 a
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
599 M c
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
600 --------------
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
601