Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge2.out @ 3320:b16456909a0a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: various tidying update tests to handle corrected output and new workingctx display
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 02:15:20 -0500
parents 966632304dde
children d2b55e3c4e25
comparison
equal deleted inserted replaced
3319:6c68bc1e7873 3320:b16456909a0a
1 -------------- 1 --------------
2 test L:up a R:nc a b W: - 1 get local a to b 2 test L:up a R:nc a b W: - 1 get local a to b
3 -------------- 3 --------------
4 resolving manifests 4 resolving manifests
5 overwrite None branchmerge True partial False 5 overwrite None partial False
6 ancestor e300d1c794ec local 735846fee2d7 remote 924404dff337 6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
7 rev: versions differ -> m 7 rev: versions differ -> m
8 a: remote copied -> m 8 a: remote copied -> m
9 merging a and b 9 merging a and b
10 my a@. other b@735846fee2d7 ancestor a@924404dff337 10 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
11 copying a to b 11 copying a to b
12 merging rev 12 merging rev
13 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 13 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337
14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
15 (branch merge, don't forget to commit) 15 (branch merge, don't forget to commit)
16 -------------- 16 --------------
17 M a 17 M a
18 M b 18 M b
21 21
22 -------------- 22 --------------
23 test L:nc a b R:up a W: - 2 get rem change to a and b 23 test L:nc a b R:up a W: - 2 get rem change to a and b
24 -------------- 24 --------------
25 resolving manifests 25 resolving manifests
26 overwrite None branchmerge True partial False 26 overwrite None partial False
27 ancestor ac809aeed39a local f4db7e329e71 remote 924404dff337 27 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
28 a: remote is newer -> g 28 a: remote is newer -> g
29 b: local copied -> m 29 b: local copied -> m
30 rev: versions differ -> m 30 rev: versions differ -> m
31 getting a 31 getting a
32 merging b and a 32 merging b and a
33 my b@. other a@f4db7e329e71 ancestor a@924404dff337 33 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337
34 merging rev 34 merging rev
35 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 35 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337
36 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 36 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
37 (branch merge, don't forget to commit) 37 (branch merge, don't forget to commit)
38 -------------- 38 --------------
39 M a 39 M a
40 M b 40 M b
43 43
44 -------------- 44 --------------
45 test L:up a R:nm a b W: - 3 get local a change to b, remove a 45 test L:up a R:nm a b W: - 3 get local a change to b, remove a
46 -------------- 46 --------------
47 resolving manifests 47 resolving manifests
48 overwrite None branchmerge True partial False 48 overwrite None partial False
49 ancestor e300d1c794ec local e03727d2d66b remote 924404dff337 49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
50 a: remote moved -> m 50 a: remote moved -> m
51 rev: versions differ -> m 51 rev: versions differ -> m
52 merging a and b 52 merging a and b
53 my a@. other b@e03727d2d66b ancestor a@924404dff337 53 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
54 copying a to b 54 copying a to b
55 removing a 55 removing a
56 merging rev 56 merging rev
57 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 57 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337
58 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 58 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59 (branch merge, don't forget to commit) 59 (branch merge, don't forget to commit)
60 -------------- 60 --------------
61 M b 61 M b
62 a 62 a
64 64
65 -------------- 65 --------------
66 test L:nm a b R:up a W: - 4 get remote change to b 66 test L:nm a b R:up a W: - 4 get remote change to b
67 -------------- 67 --------------
68 resolving manifests 68 resolving manifests
69 overwrite None branchmerge True partial False 69 overwrite None partial False
70 ancestor ecf3cb2a4219 local f4db7e329e71 remote 924404dff337 70 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
71 b: local moved -> m 71 b: local moved -> m
72 rev: versions differ -> m 72 rev: versions differ -> m
73 merging b and a 73 merging b and a
74 my b@. other a@f4db7e329e71 ancestor a@924404dff337 74 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
75 merging rev 75 merging rev
76 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 76 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337
77 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 77 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
78 (branch merge, don't forget to commit) 78 (branch merge, don't forget to commit)
79 -------------- 79 --------------
80 M b 80 M b
81 a 81 a
83 83
84 -------------- 84 --------------
85 test L: R:nc a b W: - 5 get b 85 test L: R:nc a b W: - 5 get b
86 -------------- 86 --------------
87 resolving manifests 87 resolving manifests
88 overwrite None branchmerge True partial False 88 overwrite None partial False
89 ancestor 94b33a1b7f2d local 735846fee2d7 remote 924404dff337 89 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
90 rev: versions differ -> m 90 rev: versions differ -> m
91 a: remote copied -> m 91 a: remote copied -> m
92 copying a to b 92 copying a to b
93 merging rev 93 merging rev
94 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 94 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337
95 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 95 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
96 (branch merge, don't forget to commit) 96 (branch merge, don't forget to commit)
97 -------------- 97 --------------
98 M b 98 M b
99 a 99 a
102 102
103 -------------- 103 --------------
104 test L:nc a b R: W: - 6 nothing 104 test L:nc a b R: W: - 6 nothing
105 -------------- 105 --------------
106 resolving manifests 106 resolving manifests
107 overwrite None branchmerge True partial False 107 overwrite None partial False
108 ancestor ac809aeed39a local 97c705ade336 remote 924404dff337 108 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
109 b: local copied -> m 109 b: local copied -> m
110 rev: versions differ -> m 110 rev: versions differ -> m
111 merging rev 111 merging rev
112 my rev@. other rev@97c705ade336 ancestor rev@924404dff337 112 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337
113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
114 (branch merge, don't forget to commit) 114 (branch merge, don't forget to commit)
115 -------------- 115 --------------
116 M b 116 M b
117 a 117 a
120 120
121 -------------- 121 --------------
122 test L: R:nm a b W: - 7 get b 122 test L: R:nm a b W: - 7 get b
123 -------------- 123 --------------
124 resolving manifests 124 resolving manifests
125 overwrite None branchmerge True partial False 125 overwrite None partial False
126 ancestor 94b33a1b7f2d local e03727d2d66b remote 924404dff337 126 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
127 a: remote moved -> m 127 a: remote moved -> m
128 rev: versions differ -> m 128 rev: versions differ -> m
129 copying a to b 129 copying a to b
130 removing a 130 removing a
131 merging rev 131 merging rev
132 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 132 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337
133 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 133 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
134 (branch merge, don't forget to commit) 134 (branch merge, don't forget to commit)
135 -------------- 135 --------------
136 M b 136 M b
137 a 137 a
139 139
140 -------------- 140 --------------
141 test L:nm a b R: W: - 8 nothing 141 test L:nm a b R: W: - 8 nothing
142 -------------- 142 --------------
143 resolving manifests 143 resolving manifests
144 overwrite None branchmerge True partial False 144 overwrite None partial False
145 ancestor ecf3cb2a4219 local 97c705ade336 remote 924404dff337 145 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
146 b: local moved -> m 146 b: local moved -> m
147 rev: versions differ -> m 147 rev: versions differ -> m
148 merging rev 148 merging rev
149 my rev@. other rev@97c705ade336 ancestor rev@924404dff337 149 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337
150 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 150 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
151 (branch merge, don't forget to commit) 151 (branch merge, don't forget to commit)
152 -------------- 152 --------------
153 M b 153 M b
154 a 154 a
156 156
157 -------------- 157 --------------
158 test L:um a b R:um a b W: - 9 do merge with ancestor in a 158 test L:um a b R:um a b W: - 9 do merge with ancestor in a
159 -------------- 159 --------------
160 resolving manifests 160 resolving manifests
161 overwrite None branchmerge True partial False 161 overwrite None partial False
162 ancestor ec03c2ca8642 local 79cc6877a3b7 remote 924404dff337 162 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7
163 b: versions differ -> m 163 b: versions differ -> m
164 rev: versions differ -> m 164 rev: versions differ -> m
165 merging b 165 merging b
166 my b@. other b@79cc6877a3b7 ancestor a@924404dff337 166 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337
167 merging rev 167 merging rev
168 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337 168 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337
169 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 169 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
170 (branch merge, don't forget to commit) 170 (branch merge, don't forget to commit)
171 -------------- 171 --------------
172 M b 172 M b
173 -------------- 173 --------------
174 174
175 -------------- 175 --------------
176 test L:nm a b R:nm a c W: - 11 get c, keep b 176 test L:nm a b R:nm a c W: - 11 get c, keep b
177 -------------- 177 --------------
178 resolving manifests 178 resolving manifests
179 overwrite None branchmerge True partial False 179 overwrite None partial False
180 ancestor ecf3cb2a4219 local e6abcc1a30c2 remote 924404dff337 180 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
181 rev: versions differ -> m 181 rev: versions differ -> m
182 c: remote created -> g 182 c: remote created -> g
183 getting c 183 getting c
184 merging rev 184 merging rev
185 my rev@. other rev@e6abcc1a30c2 ancestor rev@924404dff337 185 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337
186 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 186 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
187 (branch merge, don't forget to commit) 187 (branch merge, don't forget to commit)
188 -------------- 188 --------------
189 M c 189 M c
190 C b 190 C b
192 192
193 -------------- 193 --------------
194 test L:nc a b R:up b W: - 12 merge b no ancestor 194 test L:nc a b R:up b W: - 12 merge b no ancestor
195 -------------- 195 --------------
196 resolving manifests 196 resolving manifests
197 overwrite None branchmerge True partial False 197 overwrite None partial False
198 ancestor ac809aeed39a local af30c7647fc7 remote 924404dff337 198 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7
199 b: versions differ -> m 199 b: versions differ -> m
200 rev: versions differ -> m 200 rev: versions differ -> m
201 merging b 201 merging b
202 my b@. other b@af30c7647fc7 ancestor b@000000000000 202 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000
203 merging rev 203 merging rev
204 my rev@. other rev@af30c7647fc7 ancestor rev@924404dff337 204 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337
205 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 205 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
206 (branch merge, don't forget to commit) 206 (branch merge, don't forget to commit)
207 -------------- 207 --------------
208 M b 208 M b
209 C a 209 C a
211 211
212 -------------- 212 --------------
213 test L:up b R:nm a b W: - 13 merge b no ancestor 213 test L:up b R:nm a b W: - 13 merge b no ancestor
214 -------------- 214 --------------
215 resolving manifests 215 resolving manifests
216 overwrite None branchmerge True partial False 216 overwrite None partial False
217 ancestor 59318016310c local e03727d2d66b remote 924404dff337 217 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
218 a: other deleted -> r 218 a: other deleted -> r
219 b: versions differ -> m 219 b: versions differ -> m
220 rev: versions differ -> m 220 rev: versions differ -> m
221 removing a 221 removing a
222 merging b 222 merging b
223 my b@. other b@e03727d2d66b ancestor b@000000000000 223 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
224 merging rev 224 merging rev
225 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 225 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
226 0 files updated, 2 files merged, 1 files removed, 0 files unresolved 226 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
227 (branch merge, don't forget to commit) 227 (branch merge, don't forget to commit)
228 -------------- 228 --------------
229 M b 229 M b
230 -------------- 230 --------------
231 231
232 -------------- 232 --------------
233 test L:nc a b R:up a b W: - 14 merge b no ancestor 233 test L:nc a b R:up a b W: - 14 merge b no ancestor
234 -------------- 234 --------------
235 resolving manifests 235 resolving manifests
236 overwrite None branchmerge True partial False 236 overwrite None partial False
237 ancestor ac809aeed39a local 8dbce441892a remote 924404dff337 237 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
238 a: remote is newer -> g 238 a: remote is newer -> g
239 b: versions differ -> m 239 b: versions differ -> m
240 rev: versions differ -> m 240 rev: versions differ -> m
241 getting a 241 getting a
242 merging b 242 merging b
243 my b@. other b@8dbce441892a ancestor b@000000000000 243 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
244 merging rev 244 merging rev
245 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 245 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
246 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 246 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
247 (branch merge, don't forget to commit) 247 (branch merge, don't forget to commit)
248 -------------- 248 --------------
249 M a 249 M a
250 M b 250 M b
252 252
253 -------------- 253 --------------
254 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a 254 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
255 -------------- 255 --------------
256 resolving manifests 256 resolving manifests
257 overwrite None branchmerge True partial False 257 overwrite None partial False
258 ancestor 59318016310c local e03727d2d66b remote 924404dff337 258 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
259 a: other deleted -> r 259 a: other deleted -> r
260 b: versions differ -> m 260 b: versions differ -> m
261 rev: versions differ -> m 261 rev: versions differ -> m
262 removing a 262 removing a
263 merging b 263 merging b
264 my b@. other b@e03727d2d66b ancestor b@000000000000 264 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
265 merging rev 265 merging rev
266 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 266 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
267 0 files updated, 2 files merged, 1 files removed, 0 files unresolved 267 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
268 (branch merge, don't forget to commit) 268 (branch merge, don't forget to commit)
269 -------------- 269 --------------
270 M b 270 M b
271 -------------- 271 --------------
272 272
273 -------------- 273 --------------
274 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor 274 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
275 -------------- 275 --------------
276 resolving manifests 276 resolving manifests
277 overwrite None branchmerge True partial False 277 overwrite None partial False
278 ancestor ac809aeed39a local 8dbce441892a remote 924404dff337 278 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
279 a: remote is newer -> g 279 a: remote is newer -> g
280 b: versions differ -> m 280 b: versions differ -> m
281 rev: versions differ -> m 281 rev: versions differ -> m
282 getting a 282 getting a
283 merging b 283 merging b
284 my b@. other b@8dbce441892a ancestor b@000000000000 284 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
285 merging rev 285 merging rev
286 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 286 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
287 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 287 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
288 (branch merge, don't forget to commit) 288 (branch merge, don't forget to commit)
289 -------------- 289 --------------
290 M a 290 M a
291 M b 291 M b
293 293
294 -------------- 294 --------------
295 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor 295 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
296 -------------- 296 --------------
297 resolving manifests 297 resolving manifests
298 overwrite None branchmerge True partial False 298 overwrite None partial False
299 ancestor 0b76e65c8289 local 735846fee2d7 remote 924404dff337 299 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7
300 b: versions differ -> m 300 b: versions differ -> m
301 rev: versions differ -> m 301 rev: versions differ -> m
302 merging b 302 merging b
303 my b@. other b@735846fee2d7 ancestor b@000000000000 303 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000
304 merging rev 304 merging rev
305 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337 305 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337
306 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 306 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
307 (branch merge, don't forget to commit) 307 (branch merge, don't forget to commit)
308 -------------- 308 --------------
309 M b 309 M b
310 C a 310 C a
312 312
313 -------------- 313 --------------
314 test L:nm a b R:up a b W: - 18 merge b no ancestor 314 test L:nm a b R:up a b W: - 18 merge b no ancestor
315 -------------- 315 --------------
316 resolving manifests 316 resolving manifests
317 overwrite None branchmerge True partial False 317 overwrite None partial False
318 ancestor ecf3cb2a4219 local 8dbce441892a remote 924404dff337 318 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a
319 b: versions differ -> m 319 b: versions differ -> m
320 rev: versions differ -> m 320 rev: versions differ -> m
321 a: prompt recreating -> g 321 a: prompt recreating -> g
322 getting a 322 getting a
323 merging b 323 merging b
324 my b@. other b@8dbce441892a ancestor b@000000000000 324 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000
325 merging rev 325 merging rev
326 my rev@. other rev@8dbce441892a ancestor rev@924404dff337 326 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337
327 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 327 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
328 (branch merge, don't forget to commit) 328 (branch merge, don't forget to commit)
329 -------------- 329 --------------
330 M a 330 M a
331 M b 331 M b
333 333
334 -------------- 334 --------------
335 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a 335 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
336 -------------- 336 --------------
337 resolving manifests 337 resolving manifests
338 overwrite None branchmerge True partial False 338 overwrite None partial False
339 ancestor 0b76e65c8289 local e03727d2d66b remote 924404dff337 339 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
340 b: versions differ -> m 340 b: versions differ -> m
341 rev: versions differ -> m 341 rev: versions differ -> m
342 merging b 342 merging b
343 my b@. other b@e03727d2d66b ancestor b@000000000000 343 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000
344 merging rev 344 merging rev
345 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337 345 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337
346 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 346 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
347 (branch merge, don't forget to commit) 347 (branch merge, don't forget to commit)
348 -------------- 348 --------------
349 M b 349 M b
350 C a 350 C a
352 352
353 -------------- 353 --------------
354 test L:up a R:um a b W: - 20 merge a and b to b, remove a 354 test L:up a R:um a b W: - 20 merge a and b to b, remove a
355 -------------- 355 --------------
356 resolving manifests 356 resolving manifests
357 overwrite None branchmerge True partial False 357 overwrite None partial False
358 ancestor e300d1c794ec local 79cc6877a3b7 remote 924404dff337 358 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
359 a: remote moved -> m 359 a: remote moved -> m
360 rev: versions differ -> m 360 rev: versions differ -> m
361 merging a and b 361 merging a and b
362 my a@. other b@79cc6877a3b7 ancestor a@924404dff337 362 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
363 copying a to b 363 copying a to b
364 removing a 364 removing a
365 merging rev 365 merging rev
366 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337 366 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337
367 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 367 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
368 (branch merge, don't forget to commit) 368 (branch merge, don't forget to commit)
369 -------------- 369 --------------
370 M b 370 M b
371 a 371 a
373 373
374 -------------- 374 --------------
375 test L:um a b R:up a W: - 21 merge a and b to b 375 test L:um a b R:up a W: - 21 merge a and b to b
376 -------------- 376 --------------
377 resolving manifests 377 resolving manifests
378 overwrite None branchmerge True partial False 378 overwrite None partial False
379 ancestor ec03c2ca8642 local f4db7e329e71 remote 924404dff337 379 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
380 b: local moved -> m 380 b: local moved -> m
381 rev: versions differ -> m 381 rev: versions differ -> m
382 merging b and a 382 merging b and a
383 my b@. other a@f4db7e329e71 ancestor a@924404dff337 383 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
384 merging rev 384 merging rev
385 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337 385 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337
386 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 386 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
387 (branch merge, don't forget to commit) 387 (branch merge, don't forget to commit)
388 -------------- 388 --------------
389 M b 389 M b
390 a 390 a
392 392
393 -------------- 393 --------------
394 test L:nm a b R:up a c W: - 23 get c, keep b 394 test L:nm a b R:up a c W: - 23 get c, keep b
395 -------------- 395 --------------
396 resolving manifests 396 resolving manifests
397 overwrite None branchmerge True partial False 397 overwrite None partial False
398 ancestor ecf3cb2a4219 local 2b958612230f remote 924404dff337 398 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
399 b: local moved -> m 399 b: local moved -> m
400 rev: versions differ -> m 400 rev: versions differ -> m
401 c: remote created -> g 401 c: remote created -> g
402 merging b and a 402 merging b and a
403 my b@. other a@2b958612230f ancestor a@924404dff337 403 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337
404 getting c 404 getting c
405 merging rev 405 merging rev
406 my rev@. other rev@2b958612230f ancestor rev@924404dff337 406 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337
407 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 407 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
408 (branch merge, don't forget to commit) 408 (branch merge, don't forget to commit)
409 -------------- 409 --------------
410 M b 410 M b
411 a 411 a