Mercurial > hg
comparison tests/test-rebase-base.t @ 31558:13dc00c233b7
rebase: add flag to require destination
In some mercurial workflows, the default destination for rebase does not
always work well and can lead to confusing behavior. With this flag enabled,
every rebase command will require passing an explicit destination, eliminating
this confusion.
author | Ryan McElroy <rmcelroy@fb.com> |
---|---|
date | Tue, 14 Mar 2017 17:43:44 -0700 |
parents | 51e7c83e05ee |
children | 37a0ad669051 |
comparison
equal
deleted
inserted
replaced
31557:79d98e1b21a7 | 31558:13dc00c233b7 |
---|---|
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) |