Mercurial > evolve
comparison tests/test-single-head-obsolescence-named-branch-A2.t @ 6034:144d10e74757
tests: s/superceed/supersede/g
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Fri, 10 Sep 2021 16:02:20 +0300 |
parents | b20d04641c0f |
children | df773a9bed0c 8cc7732a29bf |
comparison
equal
deleted
inserted
replaced
6033:182e2a1dbd1c | 6034:144d10e74757 |
---|---|
20 .. | 20 .. |
21 .. new-state: | 21 .. new-state: |
22 .. | 22 .. |
23 .. * 2 changeset changeset on branch Z at the same location | 23 .. * 2 changeset changeset on branch Z at the same location |
24 .. * 1 changeset changeset on branch default unchanged | 24 .. * 1 changeset changeset on branch default unchanged |
25 .. * 1 changeset changeset on branch default superceeding the other ones | 25 .. * 1 changeset changeset on branch default superseding the other ones |
26 .. | 26 .. |
27 .. expected-result: | 27 .. expected-result: |
28 .. | 28 .. |
29 .. * two heads detected | 29 .. * two heads detected |
30 .. | 30 .. |