comparison mercurial/commands.py @ 2515:a6700c222314

import: make help clearer. suggested by asak.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 27 Jun 2006 09:41:05 -0700
parents f22e3e8fd457
children 9cceb439048b
comparison
equal deleted inserted replaced
2514:419c42223bee 2515:a6700c222314
1719 If there are outstanding changes in the working directory, import 1719 If there are outstanding changes in the working directory, import
1720 will abort unless given the -f flag. 1720 will abort unless given the -f flag.
1721 1721
1722 You can import a patch straight from a mail message. Even patches 1722 You can import a patch straight from a mail message. Even patches
1723 as attachments work (body part must be type text/plain or 1723 as attachments work (body part must be type text/plain or
1724 text/x-patch to be used). Sender and subject line of email 1724 text/x-patch to be used). From and Subject headers of email
1725 message are used as default committer and commit message. Any 1725 message are used as default committer and commit message. All
1726 text/plain body part before first diff is added to commit message. 1726 text/plain body parts before first diff are added to commit
1727 message.
1727 1728
1728 If imported patch was generated by hg export, user and description 1729 If imported patch was generated by hg export, user and description
1729 from patch override values from message headers and body. Values 1730 from patch override values from message headers and body. Values
1730 given on command line with -m and -u override these. 1731 given on command line with -m and -u override these.
1731 1732