diff options
Diffstat (limited to 'tests/test-rebase-newancestor.t')
-rw-r--r-- | tests/test-rebase-newancestor.t | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/tests/test-rebase-newancestor.t b/tests/test-rebase-newancestor.t new file mode 100644 index 0000000..949c5d2 --- /dev/null +++ b/tests/test-rebase-newancestor.t @@ -0,0 +1,56 @@ + $ cat >> $HGRCPATH <<EOF + > [extensions] + > graphlog= + > rebase= + > + > [alias] + > tglog = log -G --template "{rev}: '{desc}' {branches}\n" + > EOF + + $ hg init repo + $ cd repo + + $ echo A > a + $ echo >> a + $ hg ci -Am A + adding a + + $ echo B > a + $ echo >> a + $ hg ci -m B + + $ echo C > a + $ echo >> a + $ hg ci -m C + + $ hg up -q -C 0 + + $ echo D >> a + $ hg ci -Am AD + created new head + + $ hg tglog + @ 3: 'AD' + | + | o 2: 'C' + | | + | o 1: 'B' + |/ + o 0: 'A' + + $ hg rebase -s 1 -d 3 + merging a + merging a + saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob) + + $ hg tglog + @ 3: 'C' + | + o 2: 'B' + | + o 1: 'AD' + | + o 0: 'A' + + + $ cd .. |