139 calculating bids for ancestor 40663881a6dd |
139 calculating bids for ancestor 40663881a6dd |
140 searching for copies back to rev 3 |
140 searching for copies back to rev 3 |
141 resolving manifests |
141 resolving manifests |
142 branchmerge: True, force: False, partial: False |
142 branchmerge: True, force: False, partial: False |
143 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
143 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
144 f2: keep -> k |
144 f2: remote unchanged -> k |
145 f1: versions differ -> m |
145 f1: versions differ -> m |
146 |
146 |
147 auction for merging merge bids |
147 auction for merging merge bids |
148 f1: picking 'get' action |
148 f1: picking 'get' action |
149 f2: picking 'keep' action |
149 f2: picking 'keep' action |
150 end of auction |
150 end of auction |
151 |
151 |
152 f1: remote is newer -> g |
152 f1: remote is newer -> g |
153 getting f1 |
153 getting f1 |
154 updating: f1 1/1 files (100.00%) |
154 updating: f1 1/1 files (100.00%) |
155 f2: keep -> k |
155 f2: remote unchanged -> k |
156 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
156 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
157 (branch merge, don't forget to commit) |
157 (branch merge, don't forget to commit) |
158 |
158 |
159 $ head * |
159 $ head * |
160 ==> f1 <== |
160 ==> f1 <== |
174 calculating bids for ancestor 0f6b37dbe527 |
174 calculating bids for ancestor 0f6b37dbe527 |
175 searching for copies back to rev 3 |
175 searching for copies back to rev 3 |
176 resolving manifests |
176 resolving manifests |
177 branchmerge: True, force: False, partial: False |
177 branchmerge: True, force: False, partial: False |
178 ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 |
178 ancestor: 0f6b37dbe527, local: adfe50279922+, remote: 3b08d01b0ab5 |
179 f1: keep -> k |
179 f1: remote unchanged -> k |
180 f2: versions differ -> m |
180 f2: versions differ -> m |
181 |
181 |
182 calculating bids for ancestor 40663881a6dd |
182 calculating bids for ancestor 40663881a6dd |
183 searching for copies back to rev 3 |
183 searching for copies back to rev 3 |
184 resolving manifests |
184 resolving manifests |
193 end of auction |
193 end of auction |
194 |
194 |
195 f2: remote is newer -> g |
195 f2: remote is newer -> g |
196 getting f2 |
196 getting f2 |
197 updating: f2 1/1 files (100.00%) |
197 updating: f2 1/1 files (100.00%) |
198 f1: keep -> k |
198 f1: remote unchanged -> k |
199 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
199 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
200 (branch merge, don't forget to commit) |
200 (branch merge, don't forget to commit) |
201 |
201 |
202 $ head * |
202 $ head * |
203 ==> f1 <== |
203 ==> f1 <== |
247 calculating bids for ancestor 40663881a6dd |
247 calculating bids for ancestor 40663881a6dd |
248 searching for copies back to rev 3 |
248 searching for copies back to rev 3 |
249 resolving manifests |
249 resolving manifests |
250 branchmerge: True, force: False, partial: False |
250 branchmerge: True, force: False, partial: False |
251 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
251 ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
252 f2: keep -> k |
252 f2: remote unchanged -> k |
253 f1: versions differ -> m |
253 f1: versions differ -> m |
254 |
254 |
255 auction for merging merge bids |
255 auction for merging merge bids |
256 f1: picking 'get' action |
256 f1: picking 'get' action |
257 f2: picking 'keep' action |
257 f2: picking 'keep' action |
258 end of auction |
258 end of auction |
259 |
259 |
260 f1: remote is newer -> g |
260 f1: remote is newer -> g |
261 getting f1 |
261 getting f1 |
262 updating: f1 1/1 files (100.00%) |
262 updating: f1 1/1 files (100.00%) |
263 f2: keep -> k |
263 f2: remote unchanged -> k |
264 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
264 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
265 (branch merge, don't forget to commit) |
265 (branch merge, don't forget to commit) |
266 |
266 |
267 $ cd .. |
267 $ cd .. |
268 |
268 |