equal
deleted
inserted
replaced
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 the new branch only -> push denied |
25 .. * push the new branch only -> push denied |
26 .. * push the existing branch only -> push allowed |
26 .. * push the existing branch only -> push allowed |