Mercurial > hg

comparison tests/test-rebase-conflicts.t @ 42168:341bddf88ac5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: delete debug message about changes since common ancestor Same reasoning as previous patch. Differential Revision: https://phab.mercurial-scm.org/D6250
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 12 Apr 2019 21:41:51 -0700
parents 91a0bc50b288
children 12243f15d53e
comparison
equal deleted inserted replaced
42167:91a0bc50b288 42168:341bddf88ac5
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 unmatched files in other (from topological common ancestor):
252 f2.txt
253 resolving manifests 251 resolving manifests
254 branchmerge: True, force: True, partial: False 252 branchmerge: True, force: True, partial: False
255 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 253 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
256 f1.txt: remote is newer -> g 254 f1.txt: remote is newer -> g
257 getting f1.txt 255 getting f1.txt
265 rebasing 10:2f2496ddf49d "merge" (tip) 263 rebasing 10:2f2496ddf49d "merge" (tip)
266 future parents are 11 and 7 264 future parents are 11 and 7
267 already in destination 265 already in destination
268 merge against 10:2f2496ddf49d 266 merge against 10:2f2496ddf49d
269 detach base 9:e31216eec445 267 detach base 9:e31216eec445
270 unmatched files in other (from topological common ancestor):
271 f2.txt
272 resolving manifests 268 resolving manifests
273 branchmerge: True, force: True, partial: False 269 branchmerge: True, force: True, partial: False
274 ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d 270 ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
275 f1.txt: remote is newer -> g 271 f1.txt: remote is newer -> g
276 getting f1.txt 272 getting f1.txt