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
24555e216af6
Commit
24555e216af6
authored
15 years ago
by
Martin Geisler
Browse files
Options
Downloads
Plain Diff
Merge with stable
parents
909a99b92f67
19c0ff5606e1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
contrib/check-code.py
+1
-0
1 addition, 0 deletions
contrib/check-code.py
hgext/rebase.py
+10
-11
10 additions, 11 deletions
hgext/rebase.py
tests/test-merge-default
+1
-1
1 addition, 1 deletion
tests/test-merge-default
with
12 additions
and
12 deletions
contrib/check-code.py
+
1
−
0
View file @
24555e21
...
...
@@ -52,6 +52,7 @@
(
r
'
/bin/
'
,
"
don
'
t use explicit paths for tools
"
),
(
r
'
\$PWD
'
,
"
don
'
t use $PWD, use `pwd`
"
),
(
r
'
[^\n]\Z
'
,
"
no trailing newline
"
),
(
r
'
export.*=
'
,
"
don
'
t export and assign at once
"
),
]
testfilters
=
[
...
...
This diff is collapsed.
Click to expand it.
hgext/rebase.py
+
10
−
11
View file @
24555e21
...
...
@@ -38,17 +38,16 @@
rebasing, but new changesets are added as its descendants.)
You can specify which changesets to rebase in two ways: as a
\"
source
\"
changeset or as a
\"
base
\"
changeset. Both are
shorthand for a topologically related set of changesets (the
\"
source branch
\"
). If you specify source (``-s/--source``),
rebase will rebase that changeset and all of its descendants onto
dest. If you specify base (``-b/--base``), rebase will select
ancestors of base back to but not including the common ancestor
with dest. Thus, ``-b`` is less precise but more convenient than
``-s``: you can specify any changeset in the source branch, and
rebase will select the whole branch. If you specify neither ``-s``
nor ``-b``, rebase uses the parent of the working directory as the
base.
"
source
"
changeset or as a
"
base
"
changeset. Both are shorthand
for a topologically related set of changesets (the
"
source
branch
"
). If you specify source (``-s/--source``), rebase will
rebase that changeset and all of its descendants onto dest. If you
specify base (``-b/--base``), rebase will select ancestors of base
back to but not including the common ancestor with dest. Thus,
``-b`` is less precise but more convenient than ``-s``: you can
specify any changeset in the source branch, and rebase will select
the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
uses the parent of the working directory as the base.
By default, rebase recreates the changesets in the source branch
as descendants of dest and then destroys the originals. Use
...
...
This diff is collapsed.
Click to expand it.
tests/test-merge-default
+
1
−
1
View file @
24555e21
...
...
@@ -24,7 +24,7 @@
hg up
echo
% should fail because
\>
2 heads
export
HGMERGE
=
internal:other
HGMERGE
=
internal:other
;
export
HGMERGE
hg merge
echo
% should succeed
...
...
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