Mercurial > evolve

comparison tests/test-amend.t @ 6395:1328195f76a9 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 19:49:33 +0400
parents 1a13ac9ef30a bd2c42680dff
children b1d010b2e6c4
comparison
equal deleted inserted replaced
6349:3b486ae2e79a 6395:1328195f76a9
197 working directory parent is obsolete! (9092f1db7931) 197 working directory parent is obsolete! (9092f1db7931)
198 198
199 when rewritting an already rewritten changeset (i.e cset being rewritten will 199 when rewritting an already rewritten changeset (i.e cset being rewritten will
200 be the base of divergence) 200 be the base of divergence)
201 $ hg amend -m "i am gonna create divergence" 201 $ hg amend -m "i am gonna create divergence"
202 abort: amend of 9092f1db7931 creates content-divergence with aafaf407b00d 202 abort: cannot amend 9092f1db7931, as that creates content-divergence with aafaf407b00d
203 (add --verbose for details or see 'hg help evolution.instability') 203 (add --verbose for details or see 'hg help evolution.instability')
204 [255] 204 [255]
205 $ hg amend -m "i am gonna create divergence" --verbose 205 $ hg amend -m "i am gonna create divergence" --verbose
206 abort: amend of 9092f1db7931 creates content-divergence with aafaf407b00d 206 abort: cannot amend 9092f1db7931, as that creates content-divergence with aafaf407b00d
207 changeset 9092f1db7931 already have a successors as changeset aafaf407b00d 207 changeset 9092f1db7931 already has a successor in changeset aafaf407b00d
208 rewriting changeset 9092f1db7931 would create "content-divergence" 208 rewriting changeset 9092f1db7931 would create "content-divergence"
209 set experimental.evolution.allowdivergence=True to overwrite this check 209 set experimental.evolution.allowdivergence=True to skip this check
210 (see 'hg help evolution.instability' for details on content-divergence) 210 (see 'hg help evolution.instability' for details on content-divergence)
211 [255] 211 [255]
212 212
213 when rewritting a cset which has a predecessor with non-obsolete successor 213 when rewritting a cset which has a predecessor with non-obsolete successor
214 214
227 1 new obsolescence markers 227 1 new obsolescence markers
228 obsoleted 1 changesets 228 obsoleted 1 changesets
229 229
230 $ hg evolve -l 230 $ hg evolve -l
231 $ hg amend -m "i am gonna create divergence" 231 $ hg amend -m "i am gonna create divergence"
232 abort: amend of f8c05838af90 creates content-divergence with aafaf407b00d, from 9092f1db7931 232 abort: cannot amend f8c05838af90, as that creates content-divergence with aafaf407b00d, from 9092f1db7931
233 (add --verbose for details or see 'hg help evolution.instability') 233 (add --verbose for details or see 'hg help evolution.instability')
234 [255] 234 [255]
235 $ hg amend -m "i am gonna create divergence" --verbose 235 $ hg amend -m "i am gonna create divergence" --verbose
236 abort: amend of f8c05838af90 creates content-divergence with aafaf407b00d, from 9092f1db7931 236 abort: cannot amend f8c05838af90, as that creates content-divergence with aafaf407b00d, from 9092f1db7931
237 changeset f8c05838af90 is an evolution of changeset 9092f1db7931 237 changeset f8c05838af90 is a successor of changeset 9092f1db7931
238 changeset 9092f1db7931 already have a successors as changeset aafaf407b00d 238 changeset 9092f1db7931 already has a successor in changeset aafaf407b00d
239 rewriting changeset f8c05838af90 would create "content-divergence" 239 rewriting changeset f8c05838af90 would create "content-divergence"
240 set experimental.evolution.allowdivergence=True to overwrite this check 240 set experimental.evolution.allowdivergence=True to skip this check
241 (see 'hg help evolution.instability' for details on content-divergence) 241 (see 'hg help evolution.instability' for details on content-divergence)
242 [255] 242 [255]