Mercurial > hg-stable
changeset 8000:83d7c9cfb065
transplant: word-wrap help texts at 70 characters
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Sat, 04 Apr 2009 23:19:29 +0200 |
| parents | b25110140573 |
| children | c0e3aca616de |
| files | hgext/transplant.py |
| diffstat | 1 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/transplant.py Sat Apr 04 23:19:11 2009 +0200 +++ b/hgext/transplant.py Sat Apr 04 23:19:29 2009 +0200 @@ -9,8 +9,8 @@ This extension allows you to transplant patches from another branch. -Transplanted patches are recorded in .hg/transplant/transplants, as a map -from a changeset hash to its hash in the source repository. +Transplanted patches are recorded in .hg/transplant/transplants, as a +map from a changeset hash to its hash in the source repository. ''' from mercurial.i18n import _ @@ -439,8 +439,8 @@ (transplanted from CHANGESETHASH) You can rewrite the changelog message with the --filter option. - Its argument will be invoked with the current changelog message - as $1 and the patch as $2. + Its argument will be invoked with the current changelog message as + $1 and the patch as $2. If --source is specified, selects changesets from the named repository. If --branch is specified, selects changesets from the @@ -448,19 +448,21 @@ is specified, all changesets on the branch will be transplanted, otherwise you will be prompted to select the changesets you want. - hg transplant --branch REVISION --all will rebase the selected branch - (up to the named revision) onto your current working directory. + hg transplant --branch REVISION --all will rebase the selected + branch (up to the named revision) onto your current working + directory. - You can optionally mark selected transplanted changesets as - merge changesets. You will not be prompted to transplant any - ancestors of a merged transplant, and you can merge descendants - of them normally instead of transplanting them. + You can optionally mark selected transplanted changesets as merge + changesets. You will not be prompted to transplant any ancestors + of a merged transplant, and you can merge descendants of them + normally instead of transplanting them. If no merges or revisions are provided, hg transplant will start an interactive changeset browser. - If a changeset application fails, you can fix the merge by hand and - then resume where you left off by calling hg transplant --continue. + If a changeset application fails, you can fix the merge by hand + and then resume where you left off by calling hg transplant + --continue. ''' def getremotechanges(repo, url): sourcerepo = ui.expandpath(url)