Mercurial > hg
comparison tests/test-rename-merge2.out @ 7320:8dca507e56ce
ui: log non-interactive default response to stdout when verbose
This allows test scripts that feed their output into documentation
to properly show the session as it would appear to an end-user.
| author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
|---|---|
| date | Fri, 07 Nov 2008 10:27:39 +0100 |
| parents | 368a4ec603cc |
| children | 5bf5fd1e2a74 |
comparison
equal
deleted
inserted
replaced
| 7319:eae1767cc6a8 | 7320:8dca507e56ce |
|---|---|
| 453 overwrite None partial False | 453 overwrite None partial False |
| 454 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a | 454 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a |
| 455 searching for copies back to rev 1 | 455 searching for copies back to rev 1 |
| 456 b: versions differ -> m | 456 b: versions differ -> m |
| 457 rev: versions differ -> m | 457 rev: versions differ -> m |
| 458 remote changed a which local deleted | |
| 459 use (c)hanged version or leave (d)eleted? c | |
| 458 a: prompt recreating -> g | 460 a: prompt recreating -> g |
| 459 preserving b for resolve of b | 461 preserving b for resolve of b |
| 460 preserving rev for resolve of rev | 462 preserving rev for resolve of rev |
| 461 getting a | 463 getting a |
| 462 picked tool 'python ../merge' for b (binary False symlink False) | 464 picked tool 'python ../merge' for b (binary False symlink False) |
| 478 -------------- | 480 -------------- |
| 479 resolving manifests | 481 resolving manifests |
| 480 overwrite None partial False | 482 overwrite None partial False |
| 481 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b | 483 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b |
| 482 searching for copies back to rev 1 | 484 searching for copies back to rev 1 |
| 485 local changed a which remote deleted | |
| 486 use (c)hanged version or (d)elete? c | |
| 483 b: versions differ -> m | 487 b: versions differ -> m |
| 484 rev: versions differ -> m | 488 rev: versions differ -> m |
| 485 preserving b for resolve of b | 489 preserving b for resolve of b |
| 486 preserving rev for resolve of rev | 490 preserving rev for resolve of rev |
| 487 picked tool 'python ../merge' for b (binary False symlink False) | 491 picked tool 'python ../merge' for b (binary False symlink False) |