Mercurial > hg
comparison tests/test-rename-merge2.out @ 6004:5af5f0f9d724
merge: allow smarter tool configuration
Add [merge-tool] hgrc section with:
<tool>.executable = name or path (<tool>)
<tool>.args = args with $local/base/other/output ($local $base $other)
<tool>.priority = priority (default 0)
<tool>.binary = handles binary (False)
<tool>.symlink = handles symlinks (False)
<tool>.checkconflict = check for conflict markers (False)
<tool>.premerge = try internal simplemerge (True if not binary or symlink)
Four built-in tools: internal:{merge,local,other,fail}
Add [merge-patterns] section of the form:
<pattern> = <tool>
Priority of settings is:
HGMERGE
merge-patterns
ui:merge
merge-tools by priority
hgmerge, if it can be found
Changes:
unsuccessful merges leave .orig files
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 03 Feb 2008 19:29:05 -0600 |
parents | c704b03884ef |
children | 4b0c9c674707 |
comparison
equal
deleted
inserted
replaced
6003:7855b88ba838 | 6004:5af5f0f9d724 |
---|---|
11 b -> a * | 11 b -> a * |
12 checking for directory renames | 12 checking for directory renames |
13 rev: versions differ -> m | 13 rev: versions differ -> m |
14 a: remote copied to b -> m | 14 a: remote copied to b -> m |
15 copying a to b | 15 copying a to b |
16 picked tool 'python ../merge' for a (binary False symlink False) | |
16 merging a and b | 17 merging a and b |
17 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 | 18 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337 |
19 premerge successful | |
20 picked tool 'python ../merge' for rev (binary False symlink False) | |
18 merging rev | 21 merging rev |
19 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 | 22 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337 |
20 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 23 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
21 (branch merge, don't forget to commit) | 24 (branch merge, don't forget to commit) |
22 -------------- | 25 -------------- |
39 checking for directory renames | 42 checking for directory renames |
40 a: remote is newer -> g | 43 a: remote is newer -> g |
41 b: local copied to a -> m | 44 b: local copied to a -> m |
42 rev: versions differ -> m | 45 rev: versions differ -> m |
43 getting a | 46 getting a |
47 picked tool 'python ../merge' for b (binary False symlink False) | |
44 merging b and a | 48 merging b and a |
45 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 | 49 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337 |
50 premerge successful | |
51 picked tool 'python ../merge' for rev (binary False symlink False) | |
46 merging rev | 52 merging rev |
47 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 53 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
48 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 54 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
49 (branch merge, don't forget to commit) | 55 (branch merge, don't forget to commit) |
50 -------------- | 56 -------------- |
66 b -> a * | 72 b -> a * |
67 checking for directory renames | 73 checking for directory renames |
68 rev: versions differ -> m | 74 rev: versions differ -> m |
69 a: remote moved to b -> m | 75 a: remote moved to b -> m |
70 copying a to b | 76 copying a to b |
77 picked tool 'python ../merge' for a (binary False symlink False) | |
71 merging a and b | 78 merging a and b |
72 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 | 79 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337 |
80 premerge successful | |
73 removing a | 81 removing a |
82 picked tool 'python ../merge' for rev (binary False symlink False) | |
74 merging rev | 83 merging rev |
75 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 | 84 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337 |
76 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 85 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
77 (branch merge, don't forget to commit) | 86 (branch merge, don't forget to commit) |
78 -------------- | 87 -------------- |
92 all copies found (* = to merge, ! = divergent): | 101 all copies found (* = to merge, ! = divergent): |
93 b -> a * | 102 b -> a * |
94 checking for directory renames | 103 checking for directory renames |
95 b: local moved to a -> m | 104 b: local moved to a -> m |
96 rev: versions differ -> m | 105 rev: versions differ -> m |
106 picked tool 'python ../merge' for b (binary False symlink False) | |
97 merging b and a | 107 merging b and a |
98 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 | 108 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337 |
109 premerge successful | |
110 picked tool 'python ../merge' for rev (binary False symlink False) | |
99 merging rev | 111 merging rev |
100 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 112 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
101 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 |
102 (branch merge, don't forget to commit) | 114 (branch merge, don't forget to commit) |
103 -------------- | 115 -------------- |
118 b -> a | 130 b -> a |
119 checking for directory renames | 131 checking for directory renames |
120 rev: versions differ -> m | 132 rev: versions differ -> m |
121 b: remote created -> g | 133 b: remote created -> g |
122 getting b | 134 getting b |
135 picked tool 'python ../merge' for rev (binary False symlink False) | |
123 merging rev | 136 merging rev |
124 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 | 137 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337 |
125 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 138 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
126 (branch merge, don't forget to commit) | 139 (branch merge, don't forget to commit) |
127 -------------- | 140 -------------- |
140 b | 153 b |
141 all copies found (* = to merge, ! = divergent): | 154 all copies found (* = to merge, ! = divergent): |
142 b -> a | 155 b -> a |
143 checking for directory renames | 156 checking for directory renames |
144 rev: versions differ -> m | 157 rev: versions differ -> m |
158 picked tool 'python ../merge' for rev (binary False symlink False) | |
145 merging rev | 159 merging rev |
146 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 | 160 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337 |
147 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 161 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
148 (branch merge, don't forget to commit) | 162 (branch merge, don't forget to commit) |
149 -------------- | 163 -------------- |
166 a: other deleted -> r | 180 a: other deleted -> r |
167 rev: versions differ -> m | 181 rev: versions differ -> m |
168 b: remote created -> g | 182 b: remote created -> g |
169 removing a | 183 removing a |
170 getting b | 184 getting b |
185 picked tool 'python ../merge' for rev (binary False symlink False) | |
171 merging rev | 186 merging rev |
172 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 | 187 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337 |
173 1 files updated, 1 files merged, 1 files removed, 0 files unresolved | 188 1 files updated, 1 files merged, 1 files removed, 0 files unresolved |
174 (branch merge, don't forget to commit) | 189 (branch merge, don't forget to commit) |
175 -------------- | 190 -------------- |
187 b | 202 b |
188 all copies found (* = to merge, ! = divergent): | 203 all copies found (* = to merge, ! = divergent): |
189 b -> a | 204 b -> a |
190 checking for directory renames | 205 checking for directory renames |
191 rev: versions differ -> m | 206 rev: versions differ -> m |
207 picked tool 'python ../merge' for rev (binary False symlink False) | |
192 merging rev | 208 merging rev |
193 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 | 209 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337 |
194 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 210 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
195 (branch merge, don't forget to commit) | 211 (branch merge, don't forget to commit) |
196 -------------- | 212 -------------- |
204 overwrite None partial False | 220 overwrite None partial False |
205 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 | 221 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7 |
206 searching for copies back to rev 1 | 222 searching for copies back to rev 1 |
207 b: versions differ -> m | 223 b: versions differ -> m |
208 rev: versions differ -> m | 224 rev: versions differ -> m |
225 picked tool 'python ../merge' for b (binary False symlink False) | |
209 merging b | 226 merging b |
210 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 | 227 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337 |
228 picked tool 'python ../merge' for rev (binary False symlink False) | |
211 merging rev | 229 merging rev |
212 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 | 230 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
213 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 231 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
214 (branch merge, don't forget to commit) | 232 (branch merge, don't forget to commit) |
215 -------------- | 233 -------------- |
236 c: remote created -> g | 254 c: remote created -> g |
237 warning: detected divergent renames of a to: | 255 warning: detected divergent renames of a to: |
238 b | 256 b |
239 c | 257 c |
240 getting c | 258 getting c |
259 picked tool 'python ../merge' for rev (binary False symlink False) | |
241 merging rev | 260 merging rev |
242 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 | 261 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337 |
243 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 262 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
244 (branch merge, don't forget to commit) | 263 (branch merge, don't forget to commit) |
245 -------------- | 264 -------------- |
254 overwrite None partial False | 273 overwrite None partial False |
255 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 | 274 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7 |
256 searching for copies back to rev 1 | 275 searching for copies back to rev 1 |
257 b: versions differ -> m | 276 b: versions differ -> m |
258 rev: versions differ -> m | 277 rev: versions differ -> m |
278 picked tool 'python ../merge' for b (binary False symlink False) | |
259 merging b | 279 merging b |
260 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 | 280 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000 |
281 picked tool 'python ../merge' for rev (binary False symlink False) | |
261 merging rev | 282 merging rev |
262 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 | 283 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337 |
263 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 284 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
264 (branch merge, don't forget to commit) | 285 (branch merge, don't forget to commit) |
265 -------------- | 286 -------------- |
276 searching for copies back to rev 1 | 297 searching for copies back to rev 1 |
277 a: other deleted -> r | 298 a: other deleted -> r |
278 b: versions differ -> m | 299 b: versions differ -> m |
279 rev: versions differ -> m | 300 rev: versions differ -> m |
280 removing a | 301 removing a |
302 picked tool 'python ../merge' for b (binary False symlink False) | |
281 merging b | 303 merging b |
282 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 | 304 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
305 picked tool 'python ../merge' for rev (binary False symlink False) | |
283 merging rev | 306 merging rev |
284 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 | 307 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
285 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 308 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
286 (branch merge, don't forget to commit) | 309 (branch merge, don't forget to commit) |
287 -------------- | 310 -------------- |
297 searching for copies back to rev 1 | 320 searching for copies back to rev 1 |
298 a: remote is newer -> g | 321 a: remote is newer -> g |
299 b: versions differ -> m | 322 b: versions differ -> m |
300 rev: versions differ -> m | 323 rev: versions differ -> m |
301 getting a | 324 getting a |
325 picked tool 'python ../merge' for b (binary False symlink False) | |
302 merging b | 326 merging b |
303 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 | 327 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
328 picked tool 'python ../merge' for rev (binary False symlink False) | |
304 merging rev | 329 merging rev |
305 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 | 330 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
306 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 331 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
307 (branch merge, don't forget to commit) | 332 (branch merge, don't forget to commit) |
308 -------------- | 333 -------------- |
319 searching for copies back to rev 1 | 344 searching for copies back to rev 1 |
320 a: other deleted -> r | 345 a: other deleted -> r |
321 b: versions differ -> m | 346 b: versions differ -> m |
322 rev: versions differ -> m | 347 rev: versions differ -> m |
323 removing a | 348 removing a |
349 picked tool 'python ../merge' for b (binary False symlink False) | |
324 merging b | 350 merging b |
325 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 | 351 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000 |
352 picked tool 'python ../merge' for rev (binary False symlink False) | |
326 merging rev | 353 merging rev |
327 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 | 354 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337 |
328 0 files updated, 2 files merged, 1 files removed, 0 files unresolved | 355 0 files updated, 2 files merged, 1 files removed, 0 files unresolved |
329 (branch merge, don't forget to commit) | 356 (branch merge, don't forget to commit) |
330 -------------- | 357 -------------- |
340 searching for copies back to rev 1 | 367 searching for copies back to rev 1 |
341 a: remote is newer -> g | 368 a: remote is newer -> g |
342 b: versions differ -> m | 369 b: versions differ -> m |
343 rev: versions differ -> m | 370 rev: versions differ -> m |
344 getting a | 371 getting a |
372 picked tool 'python ../merge' for b (binary False symlink False) | |
345 merging b | 373 merging b |
346 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 | 374 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000 |
375 picked tool 'python ../merge' for rev (binary False symlink False) | |
347 merging rev | 376 merging rev |
348 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 | 377 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337 |
349 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 378 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
350 (branch merge, don't forget to commit) | 379 (branch merge, don't forget to commit) |
351 -------------- | 380 -------------- |
360 overwrite None partial False | 389 overwrite None partial False |
361 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 | 390 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7 |
362 searching for copies back to rev 1 | 391 searching for copies back to rev 1 |
363 b: versions differ -> m | 392 b: versions differ -> m |
364 rev: versions differ -> m | 393 rev: versions differ -> m |
394 picked tool 'python ../merge' for b (binary False symlink False) | |
365 merging b | 395 merging b |
366 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 | 396 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000 |
397 picked tool 'python ../merge' for rev (binary False symlink False) | |
367 merging rev | 398 merging rev |
368 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 | 399 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337 |
369 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 400 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
370 (branch merge, don't forget to commit) | 401 (branch merge, don't forget to commit) |
371 -------------- | 402 -------------- |
382 searching for copies back to rev 1 | 413 searching for copies back to rev 1 |
383 b: versions differ -> m | 414 b: versions differ -> m |
384 rev: versions differ -> m | 415 rev: versions differ -> m |
385 a: prompt recreating -> g | 416 a: prompt recreating -> g |
386 getting a | 417 getting a |
418 picked tool 'python ../merge' for b (binary False symlink False) | |
387 merging b | 419 merging b |
388 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 | 420 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000 |
421 picked tool 'python ../merge' for rev (binary False symlink False) | |
389 merging rev | 422 merging rev |
390 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 | 423 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337 |
391 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 424 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
392 (branch merge, don't forget to commit) | 425 (branch merge, don't forget to commit) |
393 -------------- | 426 -------------- |
402 overwrite None partial False | 435 overwrite None partial False |
403 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | 436 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b |
404 searching for copies back to rev 1 | 437 searching for copies back to rev 1 |
405 b: versions differ -> m | 438 b: versions differ -> m |
406 rev: versions differ -> m | 439 rev: versions differ -> m |
440 picked tool 'python ../merge' for b (binary False symlink False) | |
407 merging b | 441 merging b |
408 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 | 442 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000 |
443 picked tool 'python ../merge' for rev (binary False symlink False) | |
409 merging rev | 444 merging rev |
410 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 | 445 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337 |
411 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 446 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
412 (branch merge, don't forget to commit) | 447 (branch merge, don't forget to commit) |
413 -------------- | 448 -------------- |
428 b -> a * | 463 b -> a * |
429 checking for directory renames | 464 checking for directory renames |
430 rev: versions differ -> m | 465 rev: versions differ -> m |
431 a: remote moved to b -> m | 466 a: remote moved to b -> m |
432 copying a to b | 467 copying a to b |
468 picked tool 'python ../merge' for a (binary False symlink False) | |
433 merging a and b | 469 merging a and b |
434 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 | 470 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337 |
435 removing a | 471 removing a |
472 picked tool 'python ../merge' for rev (binary False symlink False) | |
436 merging rev | 473 merging rev |
437 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 | 474 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337 |
438 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 475 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
439 (branch merge, don't forget to commit) | 476 (branch merge, don't forget to commit) |
440 -------------- | 477 -------------- |
454 all copies found (* = to merge, ! = divergent): | 491 all copies found (* = to merge, ! = divergent): |
455 b -> a * | 492 b -> a * |
456 checking for directory renames | 493 checking for directory renames |
457 b: local moved to a -> m | 494 b: local moved to a -> m |
458 rev: versions differ -> m | 495 rev: versions differ -> m |
496 picked tool 'python ../merge' for b (binary False symlink False) | |
459 merging b and a | 497 merging b and a |
460 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 | 498 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337 |
499 picked tool 'python ../merge' for rev (binary False symlink False) | |
461 merging rev | 500 merging rev |
462 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 | 501 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337 |
463 0 files updated, 2 files merged, 0 files removed, 0 files unresolved | 502 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
464 (branch merge, don't forget to commit) | 503 (branch merge, don't forget to commit) |
465 -------------- | 504 -------------- |
482 b -> a * | 521 b -> a * |
483 checking for directory renames | 522 checking for directory renames |
484 b: local moved to a -> m | 523 b: local moved to a -> m |
485 rev: versions differ -> m | 524 rev: versions differ -> m |
486 c: remote created -> g | 525 c: remote created -> g |
526 picked tool 'python ../merge' for b (binary False symlink False) | |
487 merging b and a | 527 merging b and a |
488 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 | 528 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337 |
529 premerge successful | |
489 getting c | 530 getting c |
531 picked tool 'python ../merge' for rev (binary False symlink False) | |
490 merging rev | 532 merging rev |
491 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 | 533 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337 |
492 1 files updated, 2 files merged, 0 files removed, 0 files unresolved | 534 1 files updated, 2 files merged, 0 files removed, 0 files unresolved |
493 (branch merge, don't forget to commit) | 535 (branch merge, don't forget to commit) |
494 -------------- | 536 -------------- |