Mercurial > hg
view tests/test-rebase-brute-force.t @ 46546:075b2499e3d6
test-copies: add test chaining multiple merge
Right now, the copy tracing logic take the right decision for merges, but it
does not keep track of the right information about these decision and can fall
into later traps. We start with highlighting this possibility by adding new
tests, and we will fix them later.
Check the inline test documentation for details.
Differential Revision: https://phab.mercurial-scm.org/D9611
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 14 Dec 2020 17:56:56 +0100 |
parents | 7f183c643eb6 |
children |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [extensions] > drawdag=$TESTDIR/drawdag.py > bruterebase=$TESTDIR/bruterebase.py > [experimental] > evolution.createmarkers=True > evolution.allowunstable=True > EOF $ init() { > N=`expr ${N:-0} + 1` > cd $TESTTMP && hg init repo$N && cd repo$N > hg debugdrawdag > } Source looks like "N" $ init <<'EOS' > C D > |\| > A B Z > EOS $ hg debugbruterebase 'all()-Z' Z A: A':Z B: B':Z AB: A':Z B':Z C: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents AC: A':Z C':A'B BC: B':Z C':B'A ABC: A':Z B':Z C':A'B' D: D':Z AD: A':Z D':Z BD: B':Z D':B' ABD: A':Z B':Z D':B' CD: ABORT: cannot rebase 3:a35c07e8a2a4 without moving at least one of its parents ACD: A':Z C':A'B D':Z BCD: B':Z C':B'A D':B' ABCD: A':Z B':Z C':A'B' D':B' Moving backwards $ init <<'EOS' > C > |\ > A B > | > Z > EOS $ hg debugbruterebase 'all()-Z' Z B: B':Z A: BA: B':Z C: ABORT: cannot rebase 3:b8d7149b562b without moving at least one of its parents BC: B':Z C':B'A AC: BAC: B':Z C':B'A