Show More
@@ -17,7 +17,7 b' TestCase 1: 2 changeset branch, only the' | |||
|
17 | 17 | .. |
|
18 | 18 | .. new-state: |
|
19 | 19 | .. |
|
20 |
.. * 1 new changesets branches super |
|
|
20 | .. * 1 new changesets branches superseding only the head of the old one | |
|
21 | 21 | .. * base of the old branch is still alive |
|
22 | 22 | .. |
|
23 | 23 | .. expected-result: |
@@ -17,7 +17,7 b' TestCase 2: 2 changeset branch, only the' | |||
|
17 | 17 | .. |
|
18 | 18 | .. new-state: |
|
19 | 19 | .. |
|
20 |
.. * 1 new changesets branches super |
|
|
20 | .. * 1 new changesets branches superseding only the base of the old one | |
|
21 | 21 | .. * The old branch is still alive (base is obsolete, head is alive) |
|
22 | 22 | .. |
|
23 | 23 | .. expected-result: |
@@ -9,7 +9,7 b' some of the new one we push.' | |||
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 | 11 | Category B: simple case involving pruned changesets |
|
12 |
TestCase 2: multi-changeset branch, head is pruned, rest is super |
|
|
12 | TestCase 2: multi-changeset branch, head is pruned, rest is superseded | |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
|
15 | 15 | .. |
@@ -9,7 +9,7 b' some of the new one we push.' | |||
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 | 11 | Category B: simple case involving pruned changesets |
|
12 |
TestCase 3: multi-changeset branch, other is pruned, rest is super |
|
|
12 | TestCase 3: multi-changeset branch, other is pruned, rest is superseded | |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
|
15 | 15 | .. |
@@ -17,7 +17,7 b' TestCase 3: multi-changeset branch, othe' | |||
|
17 | 17 | .. |
|
18 | 18 | .. new-state: |
|
19 | 19 | .. |
|
20 |
.. * old head is super |
|
|
20 | .. * old head is superseded | |
|
21 | 21 | .. * old other is pruned |
|
22 | 22 | .. |
|
23 | 23 | .. expected-result: |
@@ -9,7 +9,7 b' some of the new one we push.' | |||
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 | 11 | Category B: simple case involving pruned changesets |
|
12 |
TestCase 5: multi-changeset branch, mix of pruned and super |
|
|
12 | TestCase 5: multi-changeset branch, mix of pruned and superseded | |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
|
15 | 15 | .. |
@@ -18,7 +18,7 b' TestCase 5: multi-changeset branch, mix ' | |||
|
18 | 18 | .. new-state: |
|
19 | 19 | .. |
|
20 | 20 | .. * old head is pruned |
|
21 |
.. * old mid is super |
|
|
21 | .. * old mid is superseded | |
|
22 | 22 | .. * old root is pruned |
|
23 | 23 | .. |
|
24 | 24 | .. expected-result: |
@@ -9,7 +9,7 b' some of the new one we push.' | |||
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 | 11 | Category B: simple case involving pruned changesets |
|
12 |
TestCase 2: multi-changeset branch, head is pruned, rest is super |
|
|
12 | TestCase 2: multi-changeset branch, head is pruned, rest is superseded, through other | |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
|
15 | 15 | .. |
@@ -8,7 +8,7 b' some of the new one we push.' | |||
|
8 | 8 | |
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 |
Category A: simple case involving a branch being super |
|
|
11 | Category A: simple case involving a branch being superseded by another. | |
|
12 | 12 | TestCase 1: single-changeset branch |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
@@ -8,7 +8,7 b' some of the new one we push.' | |||
|
8 | 8 | |
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 |
Category A: simple case involving a branch being super |
|
|
11 | Category A: simple case involving a branch being superseded by another. | |
|
12 | 12 | TestCase 2: multi-changeset branch |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
@@ -8,7 +8,7 b' some of the new one we push.' | |||
|
8 | 8 | |
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 |
Category A: simple case involving a branch being super |
|
|
11 | Category A: simple case involving a branch being superseded by another. | |
|
12 | 12 | TestCase 3: multi-changeset branch with reordering |
|
13 | 13 | |
|
14 | 14 | Push should be allowed |
@@ -8,7 +8,7 b' some of the new one we push.' | |||
|
8 | 8 | |
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 |
Category A: simple case involving a branch being super |
|
|
11 | Category A: simple case involving a branch being superseded by another. | |
|
12 | 12 | TestCase 4: New changeset as children of the successor |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
@@ -8,7 +8,7 b' some of the new one we push.' | |||
|
8 | 8 | |
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 |
Category A: simple case involving a branch being super |
|
|
11 | Category A: simple case involving a branch being superseded by another. | |
|
12 | 12 | TestCase 5: New changeset as parent of the successor |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
@@ -8,7 +8,7 b' some of the new one we push.' | |||
|
8 | 8 | |
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 |
Category A: simple case involving a branch being super |
|
|
11 | Category A: simple case involving a branch being superseded by another. | |
|
12 | 12 | TestCase 6: multi-changeset branch, split on multiple other, (base on its own branch), same number of head |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
@@ -17,8 +17,8 b' TestCase 6: multi-changeset branch, spli' | |||
|
17 | 17 | .. |
|
18 | 18 | .. new-state: |
|
19 | 19 | .. |
|
20 |
.. * 1 new branch super |
|
|
21 |
.. * 1 new changesets on the old-1-changeset-branch super |
|
|
20 | .. * 1 new branch superseding the base of the old-2-changesets-branch, | |
|
21 | .. * 1 new changesets on the old-1-changeset-branch superseding the head of the other | |
|
22 | 22 | .. |
|
23 | 23 | .. expected-result: |
|
24 | 24 | .. |
@@ -8,7 +8,7 b' some of the new one we push.' | |||
|
8 | 8 | |
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 |
Category A: simple case involving a branch being super |
|
|
11 | Category A: simple case involving a branch being superseded by another. | |
|
12 | 12 | TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
@@ -17,8 +17,8 b' TestCase 7: multi-changeset branch, spli' | |||
|
17 | 17 | .. |
|
18 | 18 | .. new-state: |
|
19 | 19 | .. |
|
20 |
.. * 1 new branch super |
|
|
21 |
.. * 1 new changesets on the old-1-changeset-branch super |
|
|
20 | .. * 1 new branch superseding the head of the old-2-changesets-branch, | |
|
21 | .. * 1 new changesets on the old-1-changeset-branch superseding the base of the other | |
|
22 | 22 | .. |
|
23 | 23 | .. expected-result: |
|
24 | 24 | .. |
@@ -8,7 +8,7 b' some of the new one we push.' | |||
|
8 | 8 | |
|
9 | 9 | This case is part of a series of tests checking this behavior. |
|
10 | 10 | |
|
11 |
Category A: simple case involving a branch being super |
|
|
11 | Category A: simple case involving a branch being superseded by another. | |
|
12 | 12 | TestCase 8: single-changeset branch indirect rewrite |
|
13 | 13 | |
|
14 | 14 | .. old-state: |
@@ -17,8 +17,8 b' TestCase 4: multi-changeset branch, spli' | |||
|
17 | 17 | .. |
|
18 | 18 | .. new-state: |
|
19 | 19 | .. |
|
20 |
.. * 1 new branch super |
|
|
21 |
.. * 1 new changesets on the old-1-changeset-branch super |
|
|
20 | .. * 1 new branch superseding the base of the old-2-changesets-branch, | |
|
21 | .. * 1 new changesets on the old-1-changeset-branch superseding the head of the other | |
|
22 | 22 | .. |
|
23 | 23 | .. expected-result: |
|
24 | 24 | .. |
@@ -17,8 +17,8 b' TestCase 5: multi-changeset branch, spli' | |||
|
17 | 17 | .. |
|
18 | 18 | .. new-state: |
|
19 | 19 | .. |
|
20 |
.. * 1 new branch super |
|
|
21 |
.. * 1 new changesets on the old-1-changeset-branch super |
|
|
20 | .. * 1 new branch superseding the head of the old-2-changesets-branch, | |
|
21 | .. * 1 new changesets on the old-1-changeset-branch superseding the base of the other | |
|
22 | 22 | .. |
|
23 | 23 | .. expected-result: |
|
24 | 24 | .. |
General Comments 0
You need to be logged in to leave comments.
Login now