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
5b41d5ad52bf
Commit
5b41d5ad52bf
authored
13 years ago
by
Matt Mackall
Browse files
Options
Downloads
Patches
Plain Diff
rebase: move bookmarks as needed with pull --rebase (issue3285)
parent
674ecd23c42c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hgext/rebase.py
+4
-0
4 additions, 0 deletions
hgext/rebase.py
tests/test-rebase-pull.t
+2
-0
2 additions, 0 deletions
tests/test-rebase-pull.t
with
6 additions
and
0 deletions
hgext/rebase.py
+
4
−
0
View file @
5b41d5ad
...
...
@@ -628,6 +628,7 @@
ui
.
debug
(
'
--update and --rebase are not compatible, ignoring
'
'
the update flag
\n
'
)
movemarkfrom
=
repo
[
'
.
'
].
node
()
cmdutil
.
bailifchanged
(
repo
)
revsprepull
=
len
(
repo
)
origpostincoming
=
commands
.
postincoming
...
...
@@ -646,6 +647,9 @@
if
dest
!=
repo
[
'
.
'
].
rev
():
# there was nothing to rebase we force an update
hg
.
update
(
repo
,
dest
)
if
bookmarks
.
update
(
repo
,
[
movemarkfrom
],
repo
[
'
.
'
].
node
()):
ui
.
status
(
_
(
"
updating bookmark %s
\n
"
)
%
repo
.
_bookmarkcurrent
)
else
:
if
opts
.
get
(
'
tool
'
):
raise
util
.
Abort
(
_
(
'
--tool can only be used with --rebase
'
))
...
...
This diff is collapsed.
Click to expand it.
tests/test-rebase-pull.t
+
2
−
0
View file @
5b41d5ad
...
...
@@ -77,6 +77,7 @@
$
cd
../
c
$
hg
book
norebase
$
hg
pull
--
rebase
pulling
from
$TESTTMP
/
a
(
glob
)
searching
for
changes
...
...
@@ -86,6 +87,7 @@
added
1
changesets
with
1
changes
to
1
files
nothing
to
rebase
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
updating
bookmark
norebase
$
hg
tglog
-
l
1
@
2
:
'
R1
'
...
...
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