##// END OF EJS Templates
rewriteutil: add pointer to help text when rewrite would cause divergence...
Martin von Zweigbergk -
r48045:055f7b9f default
parent child Browse files
Show More
@@ -114,7 +114,11 b" def precheck(repo, revs, action=b'rewrit"
114 raise error.InputError(msg)
114 raise error.InputError(msg)
115 else:
115 else:
116 raise error.InputError(
116 raise error.InputError(
117 msg, hint=_(b"add --verbose for details")
117 msg,
118 hint=_(
119 b"add --verbose for details or see "
120 b"'hg help evolution.instability'"
121 ),
118 )
122 )
119
123
120
124
@@ -239,7 +239,7 b' Cannot cause divergence by default'
239 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
239 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
240 $ hg amend -m divergent
240 $ hg amend -m divergent
241 abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
241 abort: cannot amend 112478962961, as that creates content-divergence with 16084da537dd
242 (add --verbose for details)
242 (add --verbose for details or see 'hg help evolution.instability')
243 [10]
243 [10]
244 $ hg amend -m divergent --config experimental.evolution.allowdivergence=true
244 $ hg amend -m divergent --config experimental.evolution.allowdivergence=true
245 2 new content-divergent changesets
245 2 new content-divergent changesets
@@ -151,7 +151,7 b' Changing branch of an obsoleted changese'
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
General Comments 0
You need to be logged in to leave comments. Login now