equal
deleted
inserted
replaced
109 b' rewriting changeset %s would create ' |
109 b' rewriting changeset %s would create ' |
110 b'"content-divergence"\n' |
110 b'"content-divergence"\n' |
111 b' set experimental.evolution.allowdivergence=True to ' |
111 b' set experimental.evolution.allowdivergence=True to ' |
112 b'skip this check' |
112 b'skip this check' |
113 ) % (base_ctx, other_ctx, local_ctx) |
113 ) % (base_ctx, other_ctx, local_ctx) |
114 raise error.InputError(msg) |
114 raise error.InputError( |
|
115 msg, |
|
116 hint=_( |
|
117 b"see 'hg help evolution.instability' for details on content-divergence" |
|
118 ), |
|
119 ) |
115 else: |
120 else: |
116 raise error.InputError( |
121 raise error.InputError( |
117 msg, |
122 msg, |
118 hint=_( |
123 hint=_( |
119 b"add --verbose for details or see " |
124 b"add --verbose for details or see " |