Repro: hg init a cd a echo a>a hg ci -Ama echo a>>a echo msg > msg.txt hg ci --amend --logfile msg.txt Error message: abort: options --message and --logfile are mutually exclusive
the temporary commit in cmdutil.amend (line 1619 in 2.4-rc+10-6da47b655d97) overwrites opts['message']. Therefore if logfile is specified the temporary commit fails as commit calls cmdutil.logmessage which checks for --message and --logfile. also cmdutil.amend always forces an editor anyway.
bisect says: The first bad revision is: changeset: 17473:9732473aa24b user: Pierre-Yves David <pierre-yves.david@logilab.fr> date: Sat Aug 25 16:20:41 2012 +0200 summary: amend: use an explicit commit message for temporary amending commit
I'll tackle this soon.
Fixed by http://selenic.com/repo/hg/rev/034e55bbf7c0 Pierre-Yves David <pierre-yves.david@logilab.fr> amend: fix incompatibity between logfile and message option (issue3675) Bug introduced by 9732473aa24b (please test the fix)