Show More
@@ -33,6 +33,7 b' command = registrar.command(cmdtable)' | |||||
33 | _('mark new/missing files as added/removed before committing')), |
|
33 | _('mark new/missing files as added/removed before committing')), | |
34 | ('e', 'edit', None, _('invoke editor on commit messages')), |
|
34 | ('e', 'edit', None, _('invoke editor on commit messages')), | |
35 | ('i', 'interactive', None, _('use interactive mode')), |
|
35 | ('i', 'interactive', None, _('use interactive mode')), | |
|
36 | ('n', 'note', '', _('store a note on the amend')), | |||
36 | ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2, |
|
37 | ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2, | |
37 | _('[OPTION]... [FILE]...'), |
|
38 | _('[OPTION]... [FILE]...'), | |
38 | inferrepo=True) |
|
39 | inferrepo=True) |
@@ -193,6 +193,14 b' With allowunstable, amend could work in ' | |||||
193 | |/ |
|
193 | |/ | |
194 | o 0 426bada5c675 A |
|
194 | o 0 426bada5c675 A | |
195 |
|
195 | |||
|
196 | Checking the note stored in the obsmarker | |||
|
197 | ||||
|
198 | $ echo foo > bar | |||
|
199 | $ hg add bar | |||
|
200 | $ hg amend --note "adding bar" | |||
|
201 | $ hg debugobsolete -r . | |||
|
202 | 112478962961147124edd43549aedd1a335e44bf be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'test'} | |||
|
203 | be169c7e8dbe21cd10b3d79691cbe7f241e3c21c 16084da537dd8f84cfdb3055c633772269d62e1b 0 (Thu Jan 01 00:00:00 1970 +0000) {'note': 'adding bar', 'operation': 'amend', 'user': 'test'} | |||
196 | #endif |
|
204 | #endif | |
197 |
|
205 | |||
198 | Cannot amend public changeset |
|
206 | Cannot amend public changeset |
General Comments 0
You need to be logged in to leave comments.
Login now