Mercurial > public > mercurial-scm > hg

diff tests/test-commit-amend.t @ 17863:034e55bbf7c0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
amend: fix incompatibity between logfile and message option (issue3675) Bug introduced by 9732473aa24b
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Wed, 24 Oct 2012 15:37:32 +0200
parents a8aba2921456
children 45bd0cd7ca04
line wrap: on
line diff
--- a/tests/test-commit-amend.t	Wed Oct 24 11:51:24 2012 +0200
+++ b/tests/test-commit-amend.t	Wed Oct 24 15:37:32 2012 +0200
@@ -65,9 +65,11 @@
   saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob)
 
 Remove file that was added in amended commit:
+(and test logfile option)
 
   $ hg rm b
-  $ hg ci --amend -m 'amend base1 remove new file'
+  $ echo 'amend base1 remove new file' > ../logfile
+  $ hg ci --amend -l ../logfile
   saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob)
 
   $ hg cat b