Mercurial > hg > evolve
comparison tests/test-push-checkheads-unpushed-D4.t @ 6139:144d10e74757
tests: s/superceed/supersede/g
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 10 Sep 2021 16:02:20 +0300 |
parents | f0d46ffbf1bb |
children | c0921b5277a0 fc60328270ac |
comparison
equal
deleted
inserted
replaced
6138:182e2a1dbd1c | 6139:144d10e74757 |
---|---|
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 base of the old-2-changesets-branch, | 20 .. * 1 new branch superseding the base of the old-2-changesets-branch, |
21 .. * 1 new changesets on the old-1-changeset-branch superceeding the head of the other | 21 .. * 1 new changesets on the old-1-changeset-branch superseding the head of the other |
22 .. | 22 .. |
23 .. expected-result: | 23 .. expected-result: |
24 .. | 24 .. |
25 .. * push the new branch only -> push denied (variant a) | 25 .. * push the new branch only -> push denied (variant a) |
26 .. * push the existing branch only -> push allowed (variant b) | 26 .. * push the existing branch only -> push allowed (variant b) |