Mercurial > hg
comparison tests/test-branch-change.t @ 47271:055f7b9f2307
rewriteutil: add pointer to help text when rewrite would cause divergence
The evolve extension's version of the hint has this pointer. I missed
it when I moved it to core.
Differential Revision: https://phab.mercurial-scm.org/D10723
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 17 May 2021 15:15:44 -0700 |
| parents | d90f6237b3aa |
| children | 5ced12cfa41b |
comparison
equal
deleted
inserted
replaced
| 47270:25ce16bf724b | 47271:055f7b9f2307 |
|---|---|
| 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 3938acfb5c0f, as that creates content-divergence with 7c1991464886 | 153 abort: cannot change branch of 3938acfb5c0f, as that creates content-divergence with 7c1991464886 |
| 154 (add --verbose for details) | 154 (add --verbose for details or see 'hg help evolution.instability') |
| 155 [10] | 155 [10] |
| 156 | 156 |
| 157 Make sure bookmark movement is correct | 157 Make sure bookmark movement is correct |
| 158 | 158 |
| 159 $ hg bookmark b1 | 159 $ hg bookmark b1 |