Show More
@@ -307,6 +307,8 b' h: l vs l, different' | |||
|
307 | 307 | $ echo 1 > a |
|
308 | 308 | $ echo 1 > b |
|
309 | 309 | $ chmod +x b |
|
310 | $ echo 1 > bx | |
|
311 | $ chmod +x bx | |
|
310 | 312 | $ echo x > c |
|
311 | 313 | $ chmod +x c |
|
312 | 314 | $ echo 1 > d |
@@ -321,6 +323,8 b' h: l vs l, different' | |||
|
321 | 323 | $ hg up -qr0 |
|
322 | 324 | $ echo 2 > a |
|
323 | 325 | $ echo 2 > b |
|
326 | $ echo 2 > bx | |
|
327 | $ chmod +x bx | |
|
324 | 328 | $ echo x > c |
|
325 | 329 | $ ln -s 2 d |
|
326 | 330 | $ ln -s x e |
@@ -333,6 +337,8 b' h: l vs l, different' | |||
|
333 | 337 | merging a |
|
334 | 338 | warning: cannot merge flags for b |
|
335 | 339 | merging b |
|
340 | warning: cannot merge flags for bx | |
|
341 | merging bx | |
|
336 | 342 | warning: cannot merge flags for c |
|
337 | 343 | merging d |
|
338 | 344 | warning: internal :merge cannot merge symlinks for d |
@@ -345,29 +351,31 b' h: l vs l, different' | |||
|
345 | 351 | warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
|
346 | 352 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
347 | 353 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
348 | 3 files updated, 0 files merged, 0 files removed, 5 files unresolved | |
|
354 | warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') | |
|
355 | 3 files updated, 0 files merged, 0 files removed, 6 files unresolved | |
|
349 | 356 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
350 | 357 | [1] |
|
351 | 358 | $ hg resolve -l |
|
352 | 359 | U a |
|
353 | 360 | U b |
|
361 | U bx | |
|
354 | 362 | U d |
|
355 | 363 | U f |
|
356 | 364 | U h |
|
357 | 365 | $ tellmeabout a |
|
358 | 366 | a is a plain file with content: |
|
359 |
<<<<<<< working copy: 0 |
|
|
367 | <<<<<<< working copy: 0c617753b41b - test: 2 | |
|
360 | 368 | 2 |
|
361 | 369 | ======= |
|
362 | 370 | 1 |
|
363 |
>>>>>>> merge rev: |
|
|
371 | >>>>>>> merge rev: 2e60aa20b912 - test: 1 | |
|
364 | 372 | $ tellmeabout b |
|
365 | 373 | b is a plain file with content: |
|
366 |
<<<<<<< working copy: 0 |
|
|
374 | <<<<<<< working copy: 0c617753b41b - test: 2 | |
|
367 | 375 | 2 |
|
368 | 376 | ======= |
|
369 | 377 | 1 |
|
370 |
>>>>>>> merge rev: |
|
|
378 | >>>>>>> merge rev: 2e60aa20b912 - test: 1 | |
|
371 | 379 | $ tellmeabout c |
|
372 | 380 | c is a plain file with content: |
|
373 | 381 | x |
@@ -392,6 +400,8 b' h: l vs l, different' | |||
|
392 | 400 | merging a |
|
393 | 401 | warning: cannot merge flags for b |
|
394 | 402 | merging b |
|
403 | warning: cannot merge flags for bx | |
|
404 | merging bx | |
|
395 | 405 | warning: cannot merge flags for c |
|
396 | 406 | merging d |
|
397 | 407 | warning: internal :merge cannot merge symlinks for d |
@@ -404,23 +414,24 b' h: l vs l, different' | |||
|
404 | 414 | warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
|
405 | 415 | warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
406 | 416 | warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
407 | 3 files updated, 0 files merged, 0 files removed, 5 files unresolved | |
|
417 | warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') | |
|
418 | 3 files updated, 0 files merged, 0 files removed, 6 files unresolved | |
|
408 | 419 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
409 | 420 | [1] |
|
410 | 421 | $ tellmeabout a |
|
411 | 422 | a is a plain file with content: |
|
412 |
<<<<<<< working copy: |
|
|
423 | <<<<<<< working copy: 2e60aa20b912 - test: 1 | |
|
413 | 424 | 1 |
|
414 | 425 | ======= |
|
415 | 426 | 2 |
|
416 |
>>>>>>> merge rev: 0 |
|
|
427 | >>>>>>> merge rev: 0c617753b41b - test: 2 | |
|
417 | 428 | $ tellmeabout b |
|
418 | 429 | b is an executable file with content: |
|
419 |
<<<<<<< working copy: |
|
|
430 | <<<<<<< working copy: 2e60aa20b912 - test: 1 | |
|
420 | 431 | 1 |
|
421 | 432 | ======= |
|
422 | 433 | 2 |
|
423 |
>>>>>>> merge rev: 0 |
|
|
434 | >>>>>>> merge rev: 0c617753b41b - test: 2 | |
|
424 | 435 | $ tellmeabout c |
|
425 | 436 | c is an executable file with content: |
|
426 | 437 | x |
General Comments 0
You need to be logged in to leave comments.
Login now