Mercurial > hg > mercurial-source

comparison tests/test-rebase-conflicts.t @ 42954:91a0bc50b288

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: delete debug message about search limit I'm about to rewrite mergecopies() and this message will no longer be emitted then. Let's remove the message now to remove a distraction from that patch. Differential Revision: https://phab.mercurial-scm.org/D6249
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 11 Apr 2019 23:28:38 -0700
parents 70b71421fd33
children 341bddf88ac5
comparison
equal deleted inserted replaced
42953:85f5934016f9 42954:91a0bc50b288
246 removing f2.txt 246 removing f2.txt
247 f1.txt: remote created -> g 247 f1.txt: remote created -> g
248 getting f1.txt 248 getting f1.txt
249 merge against 9:e31216eec445 249 merge against 9:e31216eec445
250 detach base 8:8e4e2c1a07ae 250 detach base 8:8e4e2c1a07ae
251 searching for copies back to rev 3
252 unmatched files in other (from topological common ancestor): 251 unmatched files in other (from topological common ancestor):
253 f2.txt 252 f2.txt
254 resolving manifests 253 resolving manifests
255 branchmerge: True, force: True, partial: False 254 branchmerge: True, force: True, partial: False
256 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 255 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
266 rebasing 10:2f2496ddf49d "merge" (tip) 265 rebasing 10:2f2496ddf49d "merge" (tip)
267 future parents are 11 and 7 266 future parents are 11 and 7
268 already in destination 267 already in destination
269 merge against 10:2f2496ddf49d 268 merge against 10:2f2496ddf49d
270 detach base 9:e31216eec445 269 detach base 9:e31216eec445
271 searching for copies back to rev 3
272 unmatched files in other (from topological common ancestor): 270 unmatched files in other (from topological common ancestor):
273 f2.txt 271 f2.txt
274 resolving manifests 272 resolving manifests
275 branchmerge: True, force: True, partial: False 273 branchmerge: True, force: True, partial: False
276 ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d 274 ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d