# HG changeset patch # User Durham Goode # Date 2014-10-14 20:34:57 # Node ID a0f89c852a0c43eb9900ddd92de898b989147609 # Parent fab9dda0f2a3f8395fc242d259cdc89cb85e4dc2 obsolete: update test-commit-amend to use obsolete option This test actually used the obs.py file as part of the test, so we need to fix up the test a little more than usual to work with the new obsolete option flags. diff --git a/tests/test-commit-amend.t b/tests/test-commit-amend.t --- a/tests/test-commit-amend.t +++ b/tests/test-commit-amend.t @@ -474,13 +474,10 @@ Test amend with obsolete Enable obsolete - $ cat > ${TESTTMP}/obs.py << EOF - > import mercurial.obsolete - > mercurial.obsolete._enabled = True + $ cat >> $HGRCPATH << EOF + > [experimental] + > evolution=createmarkers,allowunstable > EOF - $ echo '[extensions]' >> $HGRCPATH - $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH - Amend with no files changes @@ -808,7 +805,8 @@ This shouldn't be possible: $ hg branch closewithamend marked working directory as branch closewithamend (branches are permanent and global, did you want a bookmark?) - $ hg add obs.py + $ touch foo + $ hg add foo $ hg ci -m.. $ hg ci --amend --close-branch -m 'closing' abort: can only close branch heads @@ -853,6 +851,6 @@ Test that amend with --edit invokes edit HG: -- HG: user: test HG: branch 'silliness' - HG: changed obs.py + HG: changed foo $ hg parents --template "{desc}\n" editor should be invoked