| Alphare |
| hg-reviewers |
The evolve extension's version of the hint has this pointer. I missed
it when I moved it to core.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/rewriteutil.py (6 lines) | |||
| M | tests/test-amend.t (2 lines) | |||
| M | tests/test-branch-change.t (2 lines) |
| b' rewriting changeset %s would create ' | b' rewriting changeset %s would create ' | ||||
| b'"content-divergence"\n' | b'"content-divergence"\n' | ||||
| b' set experimental.evolution.allowdivergence=True to ' | b' set experimental.evolution.allowdivergence=True to ' | ||||
| b'skip this check' | b'skip this check' | ||||
| ) % (base_ctx, other_ctx, local_ctx) | ) % (base_ctx, other_ctx, local_ctx) | ||||
| raise error.InputError(msg) | raise error.InputError(msg) | ||||
| else: | else: | ||||
| raise error.InputError( | raise error.InputError( | ||||
| msg, hint=_(b"add --verbose for details") | msg, | ||||
| hint=_( | |||||
| b"add --verbose for details or see " | |||||
| b"'hg help evolution.instability'" | |||||
| ), | |||||
| ) | ) | ||||
| def disallowednewunstable(repo, revs): | def disallowednewunstable(repo, revs): | ||||
| """Checks whether editing the revs will create new unstable changesets and | """Checks whether editing the revs will create new unstable changesets and | ||||
| are we allowed to create them. | are we allowed to create them. | ||||
| To allow new unstable changesets, set the config: | To allow new unstable changesets, set the config: | ||||
| be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 16084da537dd8f84cfdb3055c633772269d62e1b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'adding bar', 'operation': 'amend', 'user': 'test'} | be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 16084da537dd8f84cfdb3055c633772269d62e1b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'note': 'adding bar', 'operation': 'amend', 'user': 'test'} | ||||
| Cannot cause divergence by default | Cannot cause divergence by default | ||||
| $ hg co --hidden 1 | $ hg co --hidden 1 | ||||
| 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||||
| $ hg amend -m divergent | $ hg amend -m divergent | ||||
| abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd | abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd | ||||
| (add --verbose for details) | (add --verbose for details or see 'hg help evolution.instability') | ||||
| [10] | [10] | ||||
| $ hg amend -m divergent --config experimental.evolution.allowdivergence=true | $ hg amend -m divergent --config experimental.evolution.allowdivergence=true | ||||
| 2 new content-divergent changesets | 2 new content-divergent changesets | ||||
| #endif | #endif | ||||
| Cannot amend public changeset | Cannot amend public changeset | ||||
| $ hg phase -r A --public | $ hg phase -r A --public | ||||
| $ hg branch -r 4 foobar | $ hg branch -r 4 foobar | ||||
| abort: hidden revision '4' was rewritten as: 7c1991464886 | abort: hidden revision '4' was rewritten as: 7c1991464886 | ||||
| (use --hidden to access hidden revisions) | (use --hidden to access hidden revisions) | ||||
| [255] | [255] | ||||
| $ hg branch -r 4 --hidden foobar | $ hg branch -r 4 --hidden foobar | ||||
| abort: cannot change branch of 3938acfb5c0f, as that creates content-divergence with 7c1991464886 | abort: cannot change branch of 3938acfb5c0f, as that creates content-divergence with 7c1991464886 | ||||
| (add --verbose for details) | (add --verbose for details or see 'hg help evolution.instability') | ||||
| [10] | [10] | ||||
| Make sure bookmark movement is correct | Make sure bookmark movement is correct | ||||
| $ hg bookmark b1 | $ hg bookmark b1 | ||||
| $ hg glog -r '.^::' | $ hg glog -r '.^::' | ||||
| @ 6:7c1991464886 Added e | @ 6:7c1991464886 Added e | ||||
| | bar (b1) | | bar (b1) | ||||