##// END OF EJS Templates
transplant: word-wrap help texts at 70 characters
Martin Geisler -
r8000:83d7c9cf default
parent child Browse files
Show More
@@ -9,8 +9,8 b''
9
9
10 This extension allows you to transplant patches from another branch.
10 This extension allows you to transplant patches from another branch.
11
11
12 Transplanted patches are recorded in .hg/transplant/transplants, as a map
12 Transplanted patches are recorded in .hg/transplant/transplants, as a
13 from a changeset hash to its hash in the source repository.
13 map from a changeset hash to its hash in the source repository.
14 '''
14 '''
15
15
16 from mercurial.i18n import _
16 from mercurial.i18n import _
@@ -439,8 +439,8 b' def transplant(ui, repo, *revs, **opts):'
439 (transplanted from CHANGESETHASH)
439 (transplanted from CHANGESETHASH)
440
440
441 You can rewrite the changelog message with the --filter option.
441 You can rewrite the changelog message with the --filter option.
442 Its argument will be invoked with the current changelog message
442 Its argument will be invoked with the current changelog message as
443 as $1 and the patch as $2.
443 $1 and the patch as $2.
444
444
445 If --source is specified, selects changesets from the named
445 If --source is specified, selects changesets from the named
446 repository. If --branch is specified, selects changesets from the
446 repository. If --branch is specified, selects changesets from the
@@ -448,19 +448,21 b' def transplant(ui, repo, *revs, **opts):'
448 is specified, all changesets on the branch will be transplanted,
448 is specified, all changesets on the branch will be transplanted,
449 otherwise you will be prompted to select the changesets you want.
449 otherwise you will be prompted to select the changesets you want.
450
450
451 hg transplant --branch REVISION --all will rebase the selected branch
451 hg transplant --branch REVISION --all will rebase the selected
452 (up to the named revision) onto your current working directory.
452 branch (up to the named revision) onto your current working
453 directory.
453
454
454 You can optionally mark selected transplanted changesets as
455 You can optionally mark selected transplanted changesets as merge
455 merge changesets. You will not be prompted to transplant any
456 changesets. You will not be prompted to transplant any ancestors
456 ancestors of a merged transplant, and you can merge descendants
457 of a merged transplant, and you can merge descendants of them
457 of them normally instead of transplanting them.
458 normally instead of transplanting them.
458
459
459 If no merges or revisions are provided, hg transplant will start
460 If no merges or revisions are provided, hg transplant will start
460 an interactive changeset browser.
461 an interactive changeset browser.
461
462
462 If a changeset application fails, you can fix the merge by hand and
463 If a changeset application fails, you can fix the merge by hand
463 then resume where you left off by calling hg transplant --continue.
464 and then resume where you left off by calling hg transplant
465 --continue.
464 '''
466 '''
465 def getremotechanges(repo, url):
467 def getremotechanges(repo, url):
466 sourcerepo = ui.expandpath(url)
468 sourcerepo = ui.expandpath(url)
General Comments 0
You need to be logged in to leave comments. Login now