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
92342fa9
Commit
92342fa9
authored
14 years ago
by
Giorgos Keramidas
Browse files
Options
Downloads
Patches
Plain Diff
rebase: add a test for committed MQ patches (
59bd20451ab6
)
parent
59bd2045
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/test-rebase-mq
+10
-0
10 additions, 0 deletions
tests/test-rebase-mq
tests/test-rebase-mq.out
+16
-0
16 additions, 0 deletions
tests/test-rebase-mq.out
with
26 additions
and
0 deletions
tests/test-rebase-mq
+
10
−
0
View file @
92342fa9
...
...
@@ -101,6 +101,11 @@
hg qnew f.patch
echo
'mq2'
>
p
hg qref
-m
'P1'
hg qcommit
-m
'save patch state'
echo
'% patch series step 1/2'
hg qseries
-s
echo
'% patch queue manifest step 1/2'
hg
-R
.hg/patches manifest
echo
'% Git patch'
cat
.hg/patches/f_git.patch | filterpatch
...
...
@@ -112,6 +117,11 @@
echo
echo
'% Rebase the applied mq patches'
hg rebase
-s
2
-d
1
--quiet
hg qcommit
-m
'save patch state'
echo
'% patch series step 2/2'
hg qseries
-s
echo
'% patch queue manifest step 2/2'
hg
-R
.hg/patches manifest
echo
'% And the patches are correct'
echo
'% Git patch'
...
...
This diff is collapsed.
Click to expand it.
tests/test-rebase-mq.out
+
16
−
0
View file @
92342fa9
...
...
@@ -80,6 +80,14 @@
popping f.patch
patch queue now empty
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% patch series step 1/2
f_git.patch: P0 (git)
f.patch: P1
% patch queue manifest step 1/2
.hgignore
f.patch
f_git.patch
series
% Git patch
P0 (git)
...
...
@@ -101,6 +109,14 @@
+mq2
% Rebase the applied mq patches
% patch series step 2/2
f_git.patch: P0 (git)
f.patch: P1
% patch queue manifest step 2/2
.hgignore
f.patch
f_git.patch
series
% And the patches are correct
% Git patch
# HG changeset patch
...
...
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