##// END OF EJS Templates
tests: simplify test-rebase-transaction.t...
Martin von Zweigbergk -
r36833:f4e9e893 default
parent child Browse files
Show More
@@ -1,49 +1,50 b''
1 Rebasing using a single transaction
2
1 $ cat >> $HGRCPATH <<EOF
3 $ cat >> $HGRCPATH <<EOF
2 > [extensions]
4 > [extensions]
3 > rebase=
5 > rebase=
4 > drawdag=$TESTDIR/drawdag.py
6 > drawdag=$TESTDIR/drawdag.py
5 >
7 >
8 > [rebase]
9 > singletransaction=True
10 >
6 > [phases]
11 > [phases]
7 > publish=False
12 > publish=False
8 >
13 >
9 > [alias]
14 > [alias]
10 > tglog = log -G --template "{rev}: {desc}"
15 > tglog = log -G --template "{rev}: {desc}"
11 > EOF
16 > EOF
12
17
13 Rebasing using a single transaction
18 Check that a simple rebase works
14
19
15 $ hg init singletr && cd singletr
20 $ hg init simple && cd simple
16 $ cat >> .hg/hgrc <<EOF
17 > [rebase]
18 > singletransaction=True
19 > EOF
20 $ hg debugdrawdag <<'EOF'
21 $ hg debugdrawdag <<'EOF'
21 > Z
22 > Z
22 > |
23 > |
23 > | D
24 > | D
24 > | |
25 > | |
25 > | C
26 > | C
26 > | |
27 > | |
27 > Y B
28 > Y B
28 > |/
29 > |/
29 > A
30 > A
30 > EOF
31 > EOF
31 - We should only see two status stored messages. One from the start, one from
32 - We should only see two status stored messages. One from the start, one from
32 - the end.
33 - the end.
33 $ hg rebase --debug -b D -d Z | grep 'status stored'
34 $ hg rebase --debug -b D -d Z | grep 'status stored'
34 rebase status stored
35 rebase status stored
35 rebase status stored
36 rebase status stored
36 $ hg tglog
37 $ hg tglog
37 o 5: D
38 o 5: D
38 |
39 |
39 o 4: C
40 o 4: C
40 |
41 |
41 o 3: B
42 o 3: B
42 |
43 |
43 o 2: Z
44 o 2: Z
44 |
45 |
45 o 1: Y
46 o 1: Y
46 |
47 |
47 o 0: A
48 o 0: A
48
49
49 $ cd ..
50 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now