Mercurial > hg-stable
diff tests/test-commit-amend.t @ 22956:a0f89c852a0c
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.
author | Durham Goode <durham@fb.com> |
---|---|
date | Tue, 14 Oct 2014 13:34:57 -0700 |
parents | f5ff18f65b73 |
children | 652ab726ba93 |
line wrap: on
line diff
--- a/tests/test-commit-amend.t Tue Oct 14 13:34:25 2014 -0700 +++ b/tests/test-commit-amend.t Tue Oct 14 13:34:57 2014 -0700 @@ -474,13 +474,10 @@ 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 @@ $ 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 @@ HG: -- HG: user: test HG: branch 'silliness' - HG: changed obs.py + HG: changed foo $ hg parents --template "{desc}\n" editor should be invoked