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