Mercurial > hg
comparison tests/test-rebase-conflicts.t @ 34865:a0100f34e20b
config: replace experimental.stabilization by experimental.evolution
We replace 'experimental.stabilization=all' by 'experimental.evolution=true'
as we will extract individual config in their own config in later patches.
Differential Revision: https://phab.mercurial-scm.org/D1148
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 17 Oct 2017 11:29:26 +0200 |
parents | eb586ed5d8ce |
children | b9bdee046cc2 |
comparison
equal
deleted
inserted
replaced
34864:fec79a3f250f | 34865:a0100f34e20b |
---|---|
395 > EOS | 395 > EOS |
396 | 396 |
397 $ hg update E -q | 397 $ hg update E -q |
398 $ echo 3 > B | 398 $ echo 3 > B |
399 $ hg commit --amend -m E -A B -q | 399 $ hg commit --amend -m E -A B -q |
400 $ hg rebase -r B+D -d . --config experimental.stabilization=all | 400 $ hg rebase -r B+D -d . --config experimental.evolution=true |
401 rebasing 1:112478962961 "B" (B) | 401 rebasing 1:112478962961 "B" (B) |
402 merging B | 402 merging B |
403 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') | 403 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
404 unresolved conflicts (see hg resolve, then hg rebase --continue) | 404 unresolved conflicts (see hg resolve, then hg rebase --continue) |
405 [1] | 405 [1] |
406 | 406 |
407 $ echo 4 > B | 407 $ echo 4 > B |
408 $ hg resolve -m | 408 $ hg resolve -m |
409 (no more unresolved files) | 409 (no more unresolved files) |
410 continue: hg rebase --continue | 410 continue: hg rebase --continue |
411 $ hg rebase --continue --config experimental.stabilization=none | 411 $ hg rebase --continue --config experimental.evolution=none |
412 rebasing 1:112478962961 "B" (B) | 412 rebasing 1:112478962961 "B" (B) |
413 rebasing 3:f585351a92f8 "D" (D) | 413 rebasing 3:f585351a92f8 "D" (D) |
414 warning: orphaned descendants detected, not stripping 112478962961 | 414 warning: orphaned descendants detected, not stripping 112478962961 |
415 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob) | 415 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob) |
416 | 416 |