Mercurial > evolve

comparison tests/test-obsolete.t @ 6809:9903ee44e658 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 Wed, 26 Jun 2024 18:09:37 +0400
parents 1328195f76a9
children b1d010b2e6c4
comparison
equal deleted inserted replaced
6808:c7d3e1d8c6f1 6809:9903ee44e658
168 Test communication of obsolete relation with a compatible client 168 Test communication of obsolete relation with a compatible client
169 169
170 $ hg init ../other-new 170 $ hg init ../other-new
171 $ hg phase --draft 'secret() - extinct()' # until we fix exclusion 171 $ hg phase --draft 'secret() - extinct()' # until we fix exclusion
172 abort: empty revision set 172 abort: empty revision set
173 [10] 173 [255]
174 $ hg push ../other-new 174 $ hg push ../other-new
175 pushing to ../other-new 175 pushing to ../other-new
176 searching for changes 176 searching for changes
177 abort: push includes orphan changeset: a7a6f2b5d8a5! 177 abort: push includes orphan changeset: a7a6f2b5d8a5!
178 (use 'hg evolve' to get a stable history or --force to ignore warnings) 178 (use 'hg evolve' to get a stable history or --force to ignore warnings)
308 .. $ echo '[extensions]' > ../other-old/.hg/hgrc 308 .. $ echo '[extensions]' > ../other-old/.hg/hgrc
309 .. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc 309 .. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc
310 .. $ hg push ../other-old 310 .. $ hg push ../other-old
311 .. pushing to ../other-old 311 .. pushing to ../other-old
312 .. searching for changes 312 .. searching for changes
313 .. abort: push includes an unstable changeset: 909a0fb57e5d 313 .. abort: push includes an unstable changeset: 909a0fb57e5d!
314 .. (use 'hg evolve' to get a stable history or --force to ignore warnings) 314 .. (use 'hg evolve' to get a stable history or --force to ignore warnings)
315 .. [255] 315 .. [255]
316 .. $ hg push -f ../other-old 316 .. $ hg push -f ../other-old
317 .. pushing to ../other-old 317 .. pushing to ../other-old
318 .. searching for changes 318 .. searching for changes