Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 11886:73112cb2a6d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Martin Geisler <mg@lazybytes.net>
date Sun, 15 Aug 2010 18:13:46 +0200
parents b9d316bcc013 2da0cf99b642
children 4532c44bb62d
comparison
equal deleted inserted replaced
11883:01e04df696e3 11886:73112cb2a6d7
724 will be committed. 724 will be committed.
725 725
726 If you are committing the result of a merge, do not provide any 726 If you are committing the result of a merge, do not provide any
727 filenames or -I/-X filters. 727 filenames or -I/-X filters.
728 728
729 If no commit message is specified, the configured editor is 729 If no commit message is specified, Mercurial starts your
730 started to prompt you for a message. 730 configured editor where you can enter a message. In case your
731 commit fails, you will find a backup of your message in
732 ``.hg/last-message.txt``.
731 733
732 See :hg:`help dates` for a list of formats valid for -d/--date. 734 See :hg:`help dates` for a list of formats valid for -d/--date.
733 735
734 Returns 0 on success, 1 if nothing changed. 736 Returns 0 on success, 1 if nothing changed.
735 """ 737 """
872 node, or 874 node, or
873 - the name of a local tag you placed earlier using ":tag", or 875 - the name of a local tag you placed earlier using ":tag", or
874 - empty to denote the default parent. 876 - empty to denote the default parent.
875 877
876 All string valued-elements are either strictly alphanumeric, or must 878 All string valued-elements are either strictly alphanumeric, or must
877 be enclosed in double quotes ("..."), with "\" as escape character. 879 be enclosed in double quotes ("..."), with "\\" as escape character.
878 880
879 Note that the --overwritten-file and --appended-file options imply the 881 Note that the --overwritten-file and --appended-file options imply the
880 use of "HGMERGE=internal:local" during DAG buildup. 882 use of "HGMERGE=internal:local" during DAG buildup.
881 """ 883 """
882 884