Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
mercurial-devel
Commits
b5129349
Commit
b5129349
authored
11 years ago
by
Mads Kiilerich
Browse files
Options
Downloads
Patches
Plain Diff
transplant: improve documentation
parent
3f5fac4b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
hgext/transplant.py
+14
-9
14 additions, 9 deletions
hgext/transplant.py
with
14 additions
and
9 deletions
hgext/transplant.py
+
14
−
9
View file @
b5129349
...
...
@@ -7,7 +7,8 @@
'''
command to transplant changesets from another branch
This extension allows you to transplant patches from another branch.
This extension allows you to transplant changes to another parent revision,
possibly in another repository. The transplant is done using
'
diff
'
patches.
Transplanted patches are recorded in .hg/transplant/transplants, as a
map from a changeset hash to its hash in the source repository.
...
...
@@ -492,7 +493,7 @@
return
(
transplants
,
merges
)
@command
(
'
transplant
'
,
[(
'
s
'
,
'
source
'
,
''
,
_
(
'
pull patche
s from REPO
'
),
_
(
'
REPO
'
)),
[(
'
s
'
,
'
source
'
,
''
,
_
(
'
transplant changeset
s from REPO
'
),
_
(
'
REPO
'
)),
(
'
b
'
,
'
branch
'
,
[],
_
(
'
use this source changeset as head
'
),
_
(
'
REV
'
)),
(
'
a
'
,
'
all
'
,
None
,
_
(
'
pull all changesets up to the --branch revisions
'
)),
(
'
p
'
,
'
prune
'
,
[],
_
(
'
skip over REV
'
),
_
(
'
REV
'
)),
...
...
@@ -502,7 +503,7 @@
(
'
e
'
,
'
edit
'
,
False
,
_
(
'
invoke editor on commit messages
'
)),
(
''
,
'
log
'
,
None
,
_
(
'
append transplant info to log message
'
)),
(
'
c
'
,
'
continue
'
,
None
,
_
(
'
continue last transplant session
'
'
after
repair
'
)),
'
after
fixing conflicts
'
)),
(
''
,
'
filter
'
,
''
,
_
(
'
filter changesets through command
'
),
_
(
'
CMD
'
))],
_
(
'
hg transplant [-s REPO] [-b BRANCH [-a]] [-p REV]
'
...
...
@@ -512,9 +513,13 @@
Selected changesets will be applied on top of the current working
directory with the log of the original changeset. The changesets
are copied and will thus appear twice in the history. Use the
rebase extension instead if you want to move a whole branch of
unpublished changesets.
are copied and will thus appear twice in the history with different
identities.
Consider using the graft command if everything is inside the same
repository - it will use merges and will usually give a better result.
Use the rebase extension if the changesets are unpublished and you want
to move them instead of copying them.
If --log is specified, log messages will have a comment appended
of the form::
...
...
@@ -525,8 +530,8 @@
Its argument will be invoked with the current changelog message as
$1 and the patch as $2.
If
--source/-s
is
specifie
d,
select
s
changesets
from the named
repository
.
--source/-s specifie
s another repository to use for
select
ing
changesets
,
just as if it temporarily had been pulled
.
If --branch/-b is specified, these revisions will be used as
heads when deciding which changsets to transplant, just as if only
these revisions had been pulled.
...
...
@@ -576,7 +581,7 @@
if
opts
.
get
(
'
continue
'
):
if
opts
.
get
(
'
branch
'
)
or
opts
.
get
(
'
all
'
)
or
opts
.
get
(
'
merge
'
):
raise
util
.
Abort
(
_
(
'
--continue is incompatible with
'
'
branch, all
or
merge
'
))
'
--
branch,
--
all
and --
merge
'
))
return
if
not
(
opts
.
get
(
'
source
'
)
or
revs
or
opts
.
get
(
'
merge
'
)
or
opts
.
get
(
'
branch
'
)):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment