Mercurial > hg
view tests/test-rebase-empty-successor.t @ 45933:2960b7fac966
setup: copy pythonXY.dll next to the hg.exe wrapper when building
This avoids the problem of having the newly built binary complaining that it
can't find the DLL. There is an option in the python.org installer to add the
python install to PATH (which defaulted to "on" with py2, and therefore was not
an issue up to this point), but that makes switching between python versions
harder.
This shouldn't be an issue with the PyOxidizer binary, but that current has
issues running some of the tests, and took noticeably longer to build last time
I tried it.
Differential Revision: https://phab.mercurial-scm.org/D9362
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 21 Nov 2020 16:20:49 -0500 |
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'