Mercurial > hg
comparison tests/test-branch-change.t @ 47020:ba6881c6a178
rewriteutil: check for divergence
This code is adapted from the code in the evolve extension. It seems
to be equivalent as far as the evolve extension's test suite can tell
(the only impact when making their `precheck()` delegate to our
version is that error messages are less detailed).
I had to change the error message to work with "change branch of"
being inserted as the action.
Differential Revision: https://phab.mercurial-scm.org/D10518
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 23 Feb 2021 10:28:42 -0800 |
parents | 7a90fddb13b0 |
children | 5b6dd0d9171b |
comparison
equal
deleted
inserted
replaced
47019:c4dbbaecaad3 | 47020:ba6881c6a178 |
---|---|
148 abort: hidden revision '4' was rewritten as: 7c1991464886 | 148 abort: hidden revision '4' was rewritten as: 7c1991464886 |
149 (use --hidden to access hidden revisions) | 149 (use --hidden to access hidden revisions) |
150 [255] | 150 [255] |
151 | 151 |
152 $ hg branch -r 4 --hidden foobar | 152 $ hg branch -r 4 --hidden foobar |
153 abort: cannot change branch of a obsolete changeset | 153 abort: cannot change branch of 3938acfb5c0f, as that creates content-divergence with 7c1991464886 |
154 (add --verbose for details) | |
154 [10] | 155 [10] |
155 | 156 |
156 Make sure bookmark movement is correct | 157 Make sure bookmark movement is correct |
157 | 158 |
158 $ hg bookmark b1 | 159 $ hg bookmark b1 |