equal
deleted
inserted
replaced
6 into play to detect if existing branches on the server are being replaced by |
6 into play to detect if existing branches on the server are being replaced by |
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 A: simple case involving a branch being superceeded by another. |
11 Category A: simple case involving a branch being superseded by another. |
12 TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head |
12 TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head |
13 |
13 |
14 .. old-state: |
14 .. old-state: |
15 .. |
15 .. |
16 .. * 2 branch (1-changeset, and 2-changesets) |
16 .. * 2 branch (1-changeset, and 2-changesets) |
17 .. |
17 .. |
18 .. new-state: |
18 .. new-state: |
19 .. |
19 .. |
20 .. * 1 new branch superceeding the head of the old-2-changesets-branch, |
20 .. * 1 new branch superseding the head of the old-2-changesets-branch, |
21 .. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other |
21 .. * 1 new changesets on the old-1-changeset-branch superseding the base of the other |
22 .. |
22 .. |
23 .. expected-result: |
23 .. expected-result: |
24 .. |
24 .. |
25 .. * push allowed |
25 .. * push allowed |
26 .. |
26 .. |