Show More
@@ -474,13 +474,10 b' Test amend with obsolete' | |||
|
474 | 474 | |
|
475 | 475 | Enable obsolete |
|
476 | 476 | |
|
477 |
$ cat > |
|
|
478 | > import mercurial.obsolete | |
|
479 | > mercurial.obsolete._enabled = True | |
|
477 | $ cat >> $HGRCPATH << EOF | |
|
478 | > [experimental] | |
|
479 | > evolution=createmarkers,allowunstable | |
|
480 | 480 | > EOF |
|
481 | $ echo '[extensions]' >> $HGRCPATH | |
|
482 | $ echo "obs=${TESTTMP}/obs.py" >> $HGRCPATH | |
|
483 | ||
|
484 | 481 | |
|
485 | 482 | Amend with no files changes |
|
486 | 483 | |
@@ -808,7 +805,8 b" This shouldn't be possible:" | |||
|
808 | 805 | $ hg branch closewithamend |
|
809 | 806 | marked working directory as branch closewithamend |
|
810 | 807 | (branches are permanent and global, did you want a bookmark?) |
|
811 | $ hg add obs.py | |
|
808 | $ touch foo | |
|
809 | $ hg add foo | |
|
812 | 810 | $ hg ci -m.. |
|
813 | 811 | $ hg ci --amend --close-branch -m 'closing' |
|
814 | 812 | abort: can only close branch heads |
@@ -853,6 +851,6 b' Test that amend with --edit invokes edit' | |||
|
853 | 851 | HG: -- |
|
854 | 852 | HG: user: test |
|
855 | 853 | HG: branch 'silliness' |
|
856 |
HG: changed |
|
|
854 | HG: changed foo | |
|
857 | 855 | $ hg parents --template "{desc}\n" |
|
858 | 856 | editor should be invoked |
General Comments 0
You need to be logged in to leave comments.
Login now