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
8b12768b
Commit
8b12768b
authored
14 years ago
by
Matt Mackall
Browse files
Options
Downloads
Patches
Plain Diff
tests: unify test-mq-qimport-fail-cleanup
parent
3177e3a7
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
tests/test-mq-qimport-fail-cleanup.out
+0
-10
0 additions, 10 deletions
tests/test-mq-qimport-fail-cleanup.out
tests/test-mq-qimport-fail-cleanup.t
+36
-29
36 additions, 29 deletions
tests/test-mq-qimport-fail-cleanup.t
with
36 additions
and
39 deletions
tests/test-mq-qimport-fail-cleanup.out
deleted
100644 → 0
+
0
−
10
View file @
3177e3a7
adding a
#empty series
#qimport valid patch followed by invalid patch
adding b.patch to series file
abort: unable to read file fakepatch
#valid patches before fail added to series
b.patch
This diff is collapsed.
Click to expand it.
tests/test-mq-qimport-fail-cleanup
→
tests/test-mq-qimport-fail-cleanup
.t
100755 → 100644
+
36
−
29
View file @
8b12768b
#!/bin/sh
#failed qimport of patches from files should cleanup by recording successfully
#imported patches in series file.
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
hg init repo
cd repo
echo a > a
hg ci -Am'add a'
Failed
qimport
of
patches
from
files
should
cleanup
by
recording
successfully
imported
patches
in
series
file
.
...
...
@@ -13,10 +3,19 @@
cat >b.patch<<EOF
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
a
+b
EOF
$
echo
"
[extensions]
"
>>
$HGRCPATH
$
echo
"
mq=
"
>>
$HGRCPATH
$
hg
init
repo
$
cd
repo
$
echo
a
>
a
$
hg
ci
-
Am
'
add a
'
adding
a
$
cat
>
b
.
patch
<<
EOF
>
diff
--
git
a
/a b/a
>
---
a
/
a
>
+++
b
/
a
>
@@
-
1
,
1
+
1
,
2
@@
>
a
>
+
b
>
EOF
$
echo
...
...
@@ -22,5 +21,9 @@
echo
echo '#empty series'
hg qseries
empty
series
$
hg
qseries
$
echo
qimport
valid
patch
followed
by
invalid
patch
...
...
@@ -26,5 +29,8 @@
echo
echo '#qimport valid patch followed by invalid patch'
hg qimport b.patch fakepatch
$
hg
qimport
b
.
patch
fakepatch
adding
b
.
patch
to
series
file
abort:
unable
to
read
file
fakepatch
[
255
]
$
echo
...
...
@@ -30,4 +36,5 @@
echo
echo '#valid patches before fail added to series'
hg qseries
valid
patches
before
fail
added
to
series
$
hg
qseries
b
.
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