equal
deleted
inserted
replaced
7 some of the new one we push. |
7 some of the new one we push. |
8 |
8 |
9 This case is part of a series of tests checking this behavior. |
9 This case is part of a series of tests checking this behavior. |
10 |
10 |
11 Category B: simple case involving pruned changesets |
11 Category B: simple case involving pruned changesets |
12 TestCase 5: multi-changeset branch, mix of pruned and superceeded |
12 TestCase 5: multi-changeset branch, mix of pruned and superseded |
13 |
13 |
14 .. old-state: |
14 .. old-state: |
15 .. |
15 .. |
16 .. * 3 changeset branch |
16 .. * 3 changeset branch |
17 .. |
17 .. |
18 .. new-state: |
18 .. new-state: |
19 .. |
19 .. |
20 .. * old head is pruned |
20 .. * old head is pruned |
21 .. * old mid is superceeded |
21 .. * old mid is superseded |
22 .. * old root is pruned |
22 .. * old root is pruned |
23 .. |
23 .. |
24 .. expected-result: |
24 .. expected-result: |
25 .. |
25 .. |
26 .. * push allowed |
26 .. * push allowed |