Mercurial > evolve
view tests/test-next-abort.t @ 6456:a80ed2e4745b stable
makefile: get setup tools out of the equation
Without these two flags, the new install does not overwrite the older one.
Impressive to see that in 2023 this is still broken.
For the record, `setup.py --help install` says:
--old-and-unmanageable Try not to use this!
--single-version-externally-managed used by system package builders to
create 'flat' eggs
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 14 Mar 2023 18:07:41 +0100 |
parents | 917cd662ef6c |
children |
line wrap: on
line source
Testing hg next with --abort flag and hg abort command handling an interrupted hg next $ . "$TESTDIR/testlib/common.sh" $ cat >> "$HGRCPATH" << EOF > [extensions] > evolve = > EOF $ hg init next-abort $ cd next-abort $ echo apple > a $ hg ci -qAm apple $ echo banana > b $ hg ci -qAm banana $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo blueberry > b $ hg ci -qAm 'apple and blueberry' --amend 1 new orphan changesets $ hg next move:[1] banana atop:[2] apple and blueberry merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') [240] #testcases abortcommand abortflag #if abortflag $ hg next --abort next aborted working directory is now at 1c7f51cf0ef0 $ hg next --abort abort: no interrupted next to abort [20] $ hg evolve --abort abort: no interrupted evolve to abort [20] $ hg next --abort --move-bookmark abort: cannot specify both --abort and --move-bookmark [10] $ hg next --abort --merge abort: cannot specify both --abort and --merge [10] #else $ hg abort --dry-run evolve in progress, will be aborted $ hg abort evolve aborted working directory is now at 1c7f51cf0ef0 $ hg abort abort: no operation in progress [20] #endif $ cd ..