Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
12607:1393a81b3bdc | 12608:16b854cb80f1 |
---|---|
1 $ cat >> $HGRCPATH <<EOF | |
2 > [extensions] | |
3 > graphlog= | |
4 > rebase= | |
5 > | |
6 > [alias] | |
7 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" | |
8 > EOF | |
9 | |
10 $ hg init repo | |
11 $ cd repo | |
12 | |
13 $ echo A > a | |
14 $ echo >> a | |
15 $ hg ci -Am A | |
16 adding a | |
17 | |
18 $ echo B > a | |
19 $ echo >> a | |
20 $ hg ci -m B | |
21 | |
22 $ echo C > a | |
23 $ echo >> a | |
24 $ hg ci -m C | |
25 | |
26 $ hg up -q -C 0 | |
27 | |
28 $ echo D >> a | |
29 $ hg ci -Am AD | |
30 created new head | |
31 | |
32 $ hg tglog | |
33 @ 3: 'AD' | |
34 | | |
35 | o 2: 'C' | |
36 | | | |
37 | o 1: 'B' | |
38 |/ | |
39 o 0: 'A' | |
40 | |
41 $ hg rebase -s 1 -d 3 | |
42 merging a | |
43 merging a | |
44 saved backup bundle to */.hg/strip-backup/*-backup.hg (glob) | |
45 | |
46 $ hg tglog | |
47 @ 3: 'C' | |
48 | | |
49 o 2: 'B' | |
50 | | |
51 o 1: 'AD' | |
52 | | |
53 o 0: 'A' | |
54 |