comparison tests/test-single-head-obsolescence-named-branch-A1.t @ 6064:28a77df6e41f mercurial-5.7

test-compat: merge mercurial-5.8 into mercurial-5.7 # no-check-commit
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 12 Oct 2021 11:15:44 +0300
parents 144d10e74757
children df773a9bed0c 8cc7732a29bf
comparison
equal deleted inserted replaced
5996:91c3a9dd5f77 6064:28a77df6e41f
18 .. * 2 changeset changeset on branch Z on top of them. 18 .. * 2 changeset changeset on branch Z on top of them.
19 .. 19 ..
20 .. new-state: 20 .. new-state:
21 .. 21 ..
22 .. * 2 changeset changeset on branch Z at the same location 22 .. * 2 changeset changeset on branch Z at the same location
23 .. * 2 changeset changeset on branch default superceeding the other ones 23 .. * 2 changeset changeset on branch default superseding the other ones
24 .. 24 ..
25 .. expected-result: 25 .. expected-result:
26 .. 26 ..
27 .. * only one head detected 27 .. * only one head detected
28 .. 28 ..