Mercurial > hg
diff tests/test-rebase-newancestor.t @ 12608:16b854cb80f1
tests: unify test-rebase*
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 01 Oct 2010 16:10:06 +0200 |
parents | tests/test-rebase-newancestor@2313dc4d9817 |
children | 6cc4b14fb76b |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-rebase-newancestor.t Fri Oct 01 16:10:06 2010 +0200 @@ -0,0 +1,54 @@ + $ 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 */.hg/strip-backup/*-backup.hg (glob) + + $ hg tglog + @ 3: 'C' + | + o 2: 'B' + | + o 1: 'AD' + | + o 0: 'A' +