Mercurial > hg
view tests/test-rebase-transaction.t @ 34621:5613fb1583d6
strip: take branch into account when selecting update target (issue5540)
Test contributed by Matt Harbison
Keep the same behavior in most cases (i.e. first parent of the first root of
stripped changsets), but if the branch differs from wdir's, try to find another
parent of stripped commits that is on the same branch.
author | Paul Morelle <paul.morelle@octobus.net> |
---|---|
date | Thu, 05 Oct 2017 16:13:05 +0200 |
parents | 8cef8f7d51d0 |
children | f4e9e89330d4 |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > rebase= > drawdag=$TESTDIR/drawdag.py > > [phases] > publish=False > > [alias] > tglog = log -G --template "{rev}: {desc}" > EOF Rebasing using a single transaction $ hg init singletr && cd singletr $ cat >> .hg/hgrc <<EOF > [rebase] > singletransaction=True > EOF $ hg debugdrawdag <<'EOF' > Z > | > | D > | | > | C > | | > Y B > |/ > A > EOF - We should only see two status stored messages. One from the start, one from - the end. $ hg rebase --debug -b D -d Z | grep 'status stored' rebase status stored rebase status stored $ hg tglog o 5: D | o 4: C | o 3: B | o 2: Z | o 1: Y | o 0: A $ cd ..