Mercurial > hg
comparison hgext/transplant.py @ 11193:687c7d395f20
Use our custom hg reStructuredText role some more
I missed these occurrences on my first scan through the source.
author | Martin Geisler <mg@aragost.com> |
---|---|
date | Tue, 18 May 2010 16:31:10 +0200 |
parents | f77f3383c666 |
children | 3d0591a66118 |
comparison
equal
deleted
inserted
replaced
11192:babf9a5f5528 | 11193:687c7d395f20 |
---|---|
451 the branch holding the named revision, up to that revision. If | 451 the branch holding the named revision, up to that revision. If |
452 --all/-a is specified, all changesets on the branch will be | 452 --all/-a is specified, all changesets on the branch will be |
453 transplanted, otherwise you will be prompted to select the | 453 transplanted, otherwise you will be prompted to select the |
454 changesets you want. | 454 changesets you want. |
455 | 455 |
456 hg transplant --branch REVISION --all will rebase the selected | 456 :hg:`transplant --branch REVISION --all` will rebase the selected |
457 branch (up to the named revision) onto your current working | 457 branch (up to the named revision) onto your current working |
458 directory. | 458 directory. |
459 | 459 |
460 You can optionally mark selected transplanted changesets as merge | 460 You can optionally mark selected transplanted changesets as merge |
461 changesets. You will not be prompted to transplant any ancestors | 461 changesets. You will not be prompted to transplant any ancestors |
462 of a merged transplant, and you can merge descendants of them | 462 of a merged transplant, and you can merge descendants of them |
463 normally instead of transplanting them. | 463 normally instead of transplanting them. |
464 | 464 |
465 If no merges or revisions are provided, hg transplant will start | 465 If no merges or revisions are provided, :hg:`transplant` will |
466 an interactive changeset browser. | 466 start an interactive changeset browser. |
467 | 467 |
468 If a changeset application fails, you can fix the merge by hand | 468 If a changeset application fails, you can fix the merge by hand |
469 and then resume where you left off by calling hg transplant | 469 and then resume where you left off by calling :hg:`transplant |
470 --continue/-c. | 470 --continue/-c`. |
471 ''' | 471 ''' |
472 def getremotechanges(repo, url): | 472 def getremotechanges(repo, url): |
473 sourcerepo = ui.expandpath(url) | 473 sourcerepo = ui.expandpath(url) |
474 source = hg.repository(ui, sourcerepo) | 474 source = hg.repository(ui, sourcerepo) |
475 common, incoming, rheads = repo.findcommonincoming(source, force=True) | 475 common, incoming, rheads = repo.findcommonincoming(source, force=True) |