Mercurial > hg
view tests/test-rebase-empty-successor.t @ 46226:0826d684a1b5
test: replace a many occurence of `python` with `$PYTHON`
Otherwise this can use the wrong python version, or worse, not find any python
at all.
Differential Revision: https://phab.mercurial-scm.org/D9730
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 12 Jan 2021 22:43:55 +0100 |
parents | f90a5c211251 |
children |
line wrap: on
line source
$ cat << EOF >> $HGRCPATH > [extensions] > rebase= > [alias] > tglog = log -G -T "{rev} '{desc}'\n" > EOF $ hg init $ echo a > a; hg add a; hg ci -m a $ echo b > b; hg add b; hg ci -m b1 $ hg up 0 -q $ echo b > b; hg add b; hg ci -m b2 -q $ hg tglog @ 2 'b2' | | o 1 'b1' |/ o 0 'a' With rewrite.empty-successor=skip, b2 is skipped because it would become empty. $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=skip --dry-run starting dry-run rebase; repository will not be changed rebasing 2:6e2aad5e0f3c tip "b2" note: not rebasing 2:6e2aad5e0f3c tip "b2", its destination already has all its changes dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase With rewrite.empty-successor=keep, b2 will be recreated although it became empty. $ hg rebase -s 2 -d 1 --config rewrite.empty-successor=keep rebasing 2:6e2aad5e0f3c tip "b2" note: created empty successor for 2:6e2aad5e0f3c tip "b2", its destination already has all its changes saved backup bundle to $TESTTMP/.hg/strip-backup/6e2aad5e0f3c-7d7c8801-rebase.hg $ hg tglog @ 2 'b2' | o 1 'b1' | o 0 'a'