equal
deleted
inserted
replaced
9 > interactive = true |
9 > interactive = true |
10 > [phases] |
10 > [phases] |
11 > publish=False |
11 > publish=False |
12 > [extensions] |
12 > [extensions] |
13 > evolve = |
13 > evolve = |
|
14 > rebase = |
14 > [experimental] |
15 > [experimental] |
15 > evolution.effect-flags = 1 |
16 > evolution.effect-flags = 1 |
16 > EOF |
17 > EOF |
17 |
18 |
18 $ hg init $TESTTMP/effect-flags |
19 $ hg init $TESTTMP/effect-flags |
50 @ 5485c92d3433 (4) B0 |
51 @ 5485c92d3433 (4) B0 |
51 | |
52 | |
52 x ef4a313b1e0a (3) B0 |
53 x ef4a313b1e0a (3) B0 |
53 rewritten by test (*) as 5485c92d3433 (glob) |
54 rewritten by test (*) as 5485c92d3433 (glob) |
54 |
55 |
|
56 rebase (parents change) |
|
57 ----------------------- |
|
58 |
|
59 $ mkcommit C0 |
|
60 $ mkcommit D0 |
|
61 $ hg rebase -r . -d 'desc(B0)' |
|
62 rebasing 6:2ee0a31bd600 "D0" (tip) |
|
63 |
|
64 check result |
|
65 |
|
66 $ hg debugobsolete --rev . |
|
67 2ee0a31bd600ca999a5e6e69bfdfde3f9c78a6f9 131ac3eecd92fb2dfd2fc59bb5e0b8efbe9e9201 0 (*) {'ef1': '4', 'user': 'test'} (glob) |
|
68 $ hg obslog . |
|
69 @ 131ac3eecd92 (7) D0 |
|
70 | |
|
71 x 2ee0a31bd600 (6) D0 |
|
72 rewritten by test (*) as 131ac3eecd92 (glob) |
|
73 |