Show More
@@ -111,7 +111,12 b" def precheck(repo, revs, action=b'rewrit" | |||
|
111 | 111 | b' set experimental.evolution.allowdivergence=True to ' |
|
112 | 112 | b'skip this check' |
|
113 | 113 | ) % (base_ctx, other_ctx, local_ctx) |
|
114 |
raise error.InputError( |
|
|
114 | raise error.InputError( | |
|
115 | msg, | |
|
116 | hint=_( | |
|
117 | b"see 'hg help evolution.instability' for details on content-divergence" | |
|
118 | ), | |
|
119 | ) | |
|
115 | 120 | else: |
|
116 | 121 | raise error.InputError( |
|
117 | 122 | msg, |
@@ -241,6 +241,13 b' Cannot cause divergence by default' | |||
|
241 | 241 | abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd |
|
242 | 242 | (add --verbose for details or see 'hg help evolution.instability') |
|
243 | 243 | [10] |
|
244 | $ hg amend -m divergent --verbose | |
|
245 | abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd | |
|
246 | changeset 112478962961 already has a successor in changeset 16084da537dd | |
|
247 | rewriting changeset 112478962961 would create "content-divergence" | |
|
248 | set experimental.evolution.allowdivergence=True to skip this check | |
|
249 | (see 'hg help evolution.instability' for details on content-divergence) | |
|
250 | [10] | |
|
244 | 251 | $ hg amend -m divergent --config experimental.evolution.allowdivergence=true |
|
245 | 252 | 2 new content-divergent changesets |
|
246 | 253 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now