Mercurial > hg
comparison tests/test-graft.t @ 15625:efdcce3fd2d5
merge: make debug output easier to read
I always found it hard to figure out what the debug code meant without
the separators.
| author | Martin Geisler <mg@aragost.com> |
|---|---|
| date | Fri, 09 Dec 2011 17:34:53 +0100 |
| parents | 646759147717 |
| children | 12309c09d19a |
comparison
equal
deleted
inserted
replaced
| 15624:be43234a6d60 | 15625:efdcce3fd2d5 |
|---|---|
| 99 b | 99 b |
| 100 all copies found (* = to merge, ! = divergent): | 100 all copies found (* = to merge, ! = divergent): |
| 101 b -> a * | 101 b -> a * |
| 102 checking for directory renames | 102 checking for directory renames |
| 103 resolving manifests | 103 resolving manifests |
| 104 overwrite False partial False | 104 overwrite: False, partial: False |
| 105 ancestor 68795b066622 local d2e44c99fd3f+ remote 5d205f8b35b6 | 105 ancestor: 68795b066622, local: d2e44c99fd3f+, remote: 5d205f8b35b6 |
| 106 b: local copied/moved to a -> m | 106 b: local copied/moved to a -> m |
| 107 preserving b for resolve of b | 107 preserving b for resolve of b |
| 108 updating: b 1/1 files (100.00%) | 108 updating: b 1/1 files (100.00%) |
| 109 searching for copies back to rev 1 | 109 searching for copies back to rev 1 |
| 110 unmatched files in local: | 110 unmatched files in local: |
| 120 grafting revision 5 | 120 grafting revision 5 |
| 121 searching for copies back to rev 1 | 121 searching for copies back to rev 1 |
| 122 unmatched files in local: | 122 unmatched files in local: |
| 123 a.orig | 123 a.orig |
| 124 resolving manifests | 124 resolving manifests |
| 125 overwrite False partial False | 125 overwrite: False, partial: False |
| 126 ancestor 4c60f11aa304 local 6f5ea6ac8b70+ remote 97f8bfe72746 | 126 ancestor: 4c60f11aa304, local: 6f5ea6ac8b70+, remote: 97f8bfe72746 |
| 127 e: remote is newer -> g | 127 e: remote is newer -> g |
| 128 updating: e 1/1 files (100.00%) | 128 updating: e 1/1 files (100.00%) |
| 129 getting e | 129 getting e |
| 130 searching for copies back to rev 1 | 130 searching for copies back to rev 1 |
| 131 unmatched files in local: | 131 unmatched files in local: |
| 137 grafting revision 4 | 137 grafting revision 4 |
| 138 searching for copies back to rev 1 | 138 searching for copies back to rev 1 |
| 139 unmatched files in local: | 139 unmatched files in local: |
| 140 a.orig | 140 a.orig |
| 141 resolving manifests | 141 resolving manifests |
| 142 overwrite False partial False | 142 overwrite: False, partial: False |
| 143 ancestor 4c60f11aa304 local 77eb504366ab+ remote 9c233e8e184d | 143 ancestor: 4c60f11aa304, local: 77eb504366ab+, remote: 9c233e8e184d |
| 144 e: versions differ -> m | 144 e: versions differ -> m |
| 145 d: remote is newer -> g | 145 d: remote is newer -> g |
| 146 preserving e for resolve of e | 146 preserving e for resolve of e |
| 147 updating: d 1/2 files (50.00%) | 147 updating: d 1/2 files (50.00%) |
| 148 getting d | 148 getting d |