Mercurial > hg

comparison tests/test-rebase-conflicts.t @ 33773:6c1a9fd8361b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: update evolution config evolution* config has been rewritten in stabilization* in the previous patch, update tests file to use the new names. Differential Revision: https://phab.mercurial-scm.org/D249
author Boris Feld <boris.feld@octobus.net>
date Fri, 04 Aug 2017 18:41:16 +0200
parents 96f43981c1c4
children 437e317d7913
comparison
equal deleted inserted replaced
33772:d434a7f0685c 33773:6c1a9fd8361b
398 > EOS 398 > EOS
399 399
400 $ hg update E -q 400 $ hg update E -q
401 $ echo 3 > B 401 $ echo 3 > B
402 $ hg commit --amend -m E -A B -q 402 $ hg commit --amend -m E -A B -q
403 $ hg rebase -r B+D -d . --config experimental.evolution=all 403 $ hg rebase -r B+D -d . --config experimental.stabilization=all
404 rebasing 1:112478962961 "B" (B) 404 rebasing 1:112478962961 "B" (B)
405 merging B 405 merging B
406 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') 406 warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
407 unresolved conflicts (see hg resolve, then hg rebase --continue) 407 unresolved conflicts (see hg resolve, then hg rebase --continue)
408 [1] 408 [1]
409 409
410 $ echo 4 > B 410 $ echo 4 > B
411 $ hg resolve -m 411 $ hg resolve -m
412 (no more unresolved files) 412 (no more unresolved files)
413 continue: hg rebase --continue 413 continue: hg rebase --continue
414 $ hg rebase --continue --config experimental.evolution=none 414 $ hg rebase --continue --config experimental.stabilization=none
415 rebasing 1:112478962961 "B" (B) 415 rebasing 1:112478962961 "B" (B)
416 not rebasing ignored 2:26805aba1e60 "C" (C) 416 not rebasing ignored 2:26805aba1e60 "C" (C)
417 rebasing 3:f585351a92f8 "D" (D) 417 rebasing 3:f585351a92f8 "D" (D)
418 warning: orphaned descendants detected, not stripping 112478962961 418 warning: orphaned descendants detected, not stripping 112478962961
419 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob) 419 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)