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
78ab0f85e249
Commit
78ab0f85e249
authored
11 years ago
by
Mads Kiilerich
Browse files
Options
Downloads
Patches
Plain Diff
rebase: improve error message for more than one external parent
parent
2160c2e0d7d1
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
-2
4 additions, 2 deletions
hgext/rebase.py
tests/test-rebase-collapse.t
+1
-1
1 addition, 1 deletion
tests/test-rebase-collapse.t
with
5 additions
and
3 deletions
hgext/rebase.py
+
4
−
2
View file @
78ab0f85
...
...
@@ -406,8 +406,10 @@
return
nullrev
if
len
(
parents
)
==
1
:
return
parents
.
pop
()
raise
util
.
Abort
(
_
(
'
unable to collapse, there is more
'
'
than one external parent
'
))
raise
util
.
Abort
(
_
(
'
unable to collapse on top of %s, there is more
'
'
than one external parent: %s
'
)
%
(
max
(
targetancestors
),
'
,
'
.
join
(
str
(
p
)
for
p
in
sorted
(
parents
))))
def
concludenode
(
repo
,
rev
,
p1
,
p2
,
commitmsg
=
None
,
editor
=
None
,
extrafn
=
None
):
'
Commit the changes and store useful information in extra
'
...
...
This diff is collapsed.
Click to expand it.
tests/test-rebase-collapse.t
+
1
−
1
View file @
78ab0f85
...
...
@@ -226,7 +226,7 @@
$ cd b1
$ hg rebase -s 2 --collapse
abort: unable to collapse, there is more than one external parent
abort: unable to collapse
on top of 7
, there is more than one external parent
: 1, 5
[255]
Rebase and collapse - E onto H:
...
...
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