Mercurial > evolve

comparison tests/test-obsolete.t @ 5892:34cd08a46b6d 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 Sat, 24 Apr 2021 20:01:39 +0800
parents 08c30eef85d3
children 669270305ccb c0921b5277a0
comparison
equal deleted inserted replaced
5891:b13cb2d500ae 5892:34cd08a46b6d
173 Test communication of obsolete relation with a compatible client 173 Test communication of obsolete relation with a compatible client
174 174
175 $ hg init ../other-new 175 $ hg init ../other-new
176 $ hg phase --draft 'secret() - extinct()' # until we fix exclusion 176 $ hg phase --draft 'secret() - extinct()' # until we fix exclusion
177 abort: empty revision set 177 abort: empty revision set
178 [10] 178 [255]
179 $ hg push ../other-new 179 $ hg push ../other-new
180 pushing to ../other-new 180 pushing to ../other-new
181 searching for changes 181 searching for changes
182 abort: push includes orphan changeset: a7a6f2b5d8a5! 182 abort: push includes orphan changeset: a7a6f2b5d8a5!
183 (use 'hg evolve' to get a stable history or --force to ignore warnings) 183 (use 'hg evolve' to get a stable history or --force to ignore warnings)
312 .. $ echo '[extensions]' > ../other-old/.hg/hgrc 312 .. $ echo '[extensions]' > ../other-old/.hg/hgrc
313 .. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc 313 .. $ echo "obsolete=!$(echo $(dirname $TESTDIR))/obsolete.py" >> ../other-old/.hg/hgrc
314 .. $ hg push ../other-old 314 .. $ hg push ../other-old
315 .. pushing to ../other-old 315 .. pushing to ../other-old
316 .. searching for changes 316 .. searching for changes
317 .. abort: push includes an unstable changeset: 909a0fb57e5d 317 .. abort: push includes an unstable changeset: 909a0fb57e5d!
318 .. (use 'hg evolve' to get a stable history or --force to ignore warnings) 318 .. (use 'hg evolve' to get a stable history or --force to ignore warnings)
319 .. [255] 319 .. [255]
320 .. $ hg push -f ../other-old 320 .. $ hg push -f ../other-old
321 .. pushing to ../other-old 321 .. pushing to ../other-old
322 .. searching for changes 322 .. searching for changes