Mercurial > hg
comparison tests/test-rebase-base.t @ 31729:c069c4e271e3
rebase: move destination test to new test file
We'll be adding a lot more tests here, so it makes sense to have this in its
own file now.
author | Ryan McElroy <rmcelroy@fb.com> |
---|---|
date | Thu, 30 Mar 2017 03:50:10 -0700 |
parents | b26975483841 |
children | 78496ac30025 |
comparison
equal
deleted
inserted
replaced
31728:35eb8f112c88 | 31729:c069c4e271e3 |
---|---|
389 | | | 389 | | |
390 o | 1: C | 390 o | 1: C |
391 / | 391 / |
392 o 0: A | 392 o 0: A |
393 | 393 |
394 Require a destination | |
395 $ cat >> $HGRCPATH <<EOF | |
396 > [commands] | |
397 > rebase.requiredest = True | |
398 > EOF | |
399 $ hg init repo | |
400 $ cd repo | |
401 $ echo a >> a | |
402 $ hg commit -qAm aa | |
403 $ echo b >> b | |
404 $ hg commit -qAm bb | |
405 $ hg up ".^" | |
406 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
407 $ echo c >> c | |
408 $ hg commit -qAm cc | |
409 $ hg rebase | |
410 abort: you must specify a destination | |
411 (use: hg rebase -d REV) | |
412 [255] | |
413 $ hg rebase -d 1 | |
414 rebasing 2:5db65b93a12b "cc" (tip) | |
415 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/5db65b93a12b-4fb789ec-backup.hg (glob) | |
416 $ hg rebase -d 0 -r . -q | |
417 $ HGPLAIN=1 hg rebase | |
418 rebasing 2:889b0bc6a730 "cc" (tip) | |
419 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob) | |
420 $ hg rebase -d 0 -r . -q | |
421 $ hg --config commands.rebase.requiredest=False rebase | |
422 rebasing 2:279de9495438 "cc" (tip) | |
423 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob) |