##// END OF EJS Templates
amend: fix incompatibity between logfile and message option (issue3675)...
Pierre-Yves David -
r17863:034e55bb stable
parent child Browse files
Show More
@@ -1611,6 +1611,10 b' def amend(ui, repo, commitfunc, old, ext'
1611 # See if we got a message from -m or -l, if not, open the editor
1611 # See if we got a message from -m or -l, if not, open the editor
1612 # with the message of the changeset to amend
1612 # with the message of the changeset to amend
1613 message = logmessage(ui, opts)
1613 message = logmessage(ui, opts)
1614 # ensure logfile does not conflict with later enforcement of the
1615 # message. potential logfile content has been processed by
1616 # `logmessage` anyway.
1617 opts.pop('logfile')
1614 # First, do a regular commit to record all changes in the working
1618 # First, do a regular commit to record all changes in the working
1615 # directory (if there are any)
1619 # directory (if there are any)
1616 ui.callhooks = False
1620 ui.callhooks = False
@@ -65,9 +65,11 b' Add new file:'
65 saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob)
65 saved backup bundle to $TESTTMP/.hg/strip-backup/43f1ba15f28a-amend-backup.hg (glob)
66
66
67 Remove file that was added in amended commit:
67 Remove file that was added in amended commit:
68 (and test logfile option)
68
69
69 $ hg rm b
70 $ hg rm b
70 $ hg ci --amend -m 'amend base1 remove new file'
71 $ echo 'amend base1 remove new file' > ../logfile
72 $ hg ci --amend -l ../logfile
71 saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob)
73 saved backup bundle to $TESTTMP/.hg/strip-backup/b8e3cb2b3882-amend-backup.hg (glob)
72
74
73 $ hg cat b
75 $ hg cat b
General Comments 0
You need to be logged in to leave comments. Login now