##// END OF EJS Templates
tests: fix a couple of drawdag.py references...
Augie Fackler -
r39703:0b7594ad default
parent child Browse files
Show More
@@ -1,30 +1,30 b''
1 $ cat >> $HGRCPATH << EOF
1 $ cat >> $HGRCPATH << EOF
2 > [extensions]
2 > [extensions]
3 > absorb=
3 > absorb=
4 > drawdag=$RUNTESTDIR/drawdag.py
4 > drawdag=$TESTDIR/drawdag.py
5 > EOF
5 > EOF
6
6
7 $ hg init
7 $ hg init
8 $ hg debugdrawdag <<'EOS'
8 $ hg debugdrawdag <<'EOS'
9 > C
9 > C
10 > |
10 > |
11 > B
11 > B
12 > |
12 > |
13 > A
13 > A
14 > EOS
14 > EOS
15
15
16 $ hg phase -r A --public -q
16 $ hg phase -r A --public -q
17 $ hg phase -r C --secret --force -q
17 $ hg phase -r C --secret --force -q
18
18
19 $ hg update C -q
19 $ hg update C -q
20 $ printf B1 > B
20 $ printf B1 > B
21
21
22 $ hg absorb -q
22 $ hg absorb -q
23
23
24 $ hg log -G -T '{desc} {phase}'
24 $ hg log -G -T '{desc} {phase}'
25 @ C secret
25 @ C secret
26 |
26 |
27 o B draft
27 o B draft
28 |
28 |
29 o A public
29 o A public
30
30
@@ -1,45 +1,45 b''
1 Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits
1 Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits
2
2
3 $ cat >> $HGRCPATH << EOF
3 $ cat >> $HGRCPATH << EOF
4 > [extensions]
4 > [extensions]
5 > absorb=
5 > absorb=
6 > drawdag=$RUNTESTDIR/drawdag.py
6 > drawdag=$TESTDIR/drawdag.py
7 > EOF
7 > EOF
8
8
9 $ hg init
9 $ hg init
10 $ hg debugdrawdag << EOF
10 $ hg debugdrawdag << EOF
11 > E
11 > E
12 > |
12 > |
13 > D F
13 > D F
14 > |/
14 > |/
15 > C
15 > C
16 > |
16 > |
17 > B
17 > B
18 > |
18 > |
19 > A
19 > A
20 > EOF
20 > EOF
21
21
22 $ hg up E -q
22 $ hg up E -q
23 $ echo 1 >> B
23 $ echo 1 >> B
24 $ echo 2 >> D
24 $ echo 2 >> D
25 $ hg absorb
25 $ hg absorb
26 saved backup bundle to * (glob)
26 saved backup bundle to * (glob)
27 2 of 2 chunk(s) applied
27 2 of 2 chunk(s) applied
28
28
29 $ hg log -G -T '{desc}'
29 $ hg log -G -T '{desc}'
30 @ E
30 @ E
31 |
31 |
32 o D
32 o D
33 |
33 |
34 o C
34 o C
35 |
35 |
36 o B
36 o B
37 |
37 |
38 | o F
38 | o F
39 | |
39 | |
40 | o C
40 | o C
41 | |
41 | |
42 | o B
42 | o B
43 |/
43 |/
44 o A
44 o A
45
45
General Comments 0
You need to be logged in to leave comments. Login now