112 scanning for duplicate grafts |
112 scanning for duplicate grafts |
113 skipping already grafted revision 2 |
113 skipping already grafted revision 2 |
114 grafting revision 1 |
114 grafting revision 1 |
115 searching for copies back to rev 1 |
115 searching for copies back to rev 1 |
116 unmatched files in local: |
116 unmatched files in local: |
117 a.orig |
|
118 b |
117 b |
119 all copies found (* = to merge, ! = divergent): |
118 all copies found (* = to merge, ! = divergent): |
120 b -> a * |
119 b -> a * |
121 checking for directory renames |
120 checking for directory renames |
122 resolving manifests |
121 resolving manifests |
128 b |
127 b |
129 b: searching for copy revision for a |
128 b: searching for copy revision for a |
130 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
129 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 |
131 grafting revision 5 |
130 grafting revision 5 |
132 searching for copies back to rev 1 |
131 searching for copies back to rev 1 |
133 unmatched files in local: |
|
134 a.orig |
|
135 resolving manifests |
132 resolving manifests |
136 overwrite: False, partial: False |
133 overwrite: False, partial: False |
137 ancestor: 4c60f11aa304, local: 6f5ea6ac8b70+, remote: 97f8bfe72746 |
134 ancestor: 4c60f11aa304, local: 6f5ea6ac8b70+, remote: 97f8bfe72746 |
138 e: remote is newer -> g |
135 e: remote is newer -> g |
139 updating: e 1/1 files (100.00%) |
136 updating: e 1/1 files (100.00%) |
140 getting e |
137 getting e |
141 e |
138 e |
142 grafting revision 4 |
139 grafting revision 4 |
143 searching for copies back to rev 1 |
140 searching for copies back to rev 1 |
144 unmatched files in local: |
|
145 a.orig |
|
146 resolving manifests |
141 resolving manifests |
147 overwrite: False, partial: False |
142 overwrite: False, partial: False |
148 ancestor: 4c60f11aa304, local: 77eb504366ab+, remote: 9c233e8e184d |
143 ancestor: 4c60f11aa304, local: 77eb504366ab+, remote: 9c233e8e184d |
149 e: versions differ -> m |
144 e: versions differ -> m |
150 d: remote is newer -> g |
145 d: remote is newer -> g |