Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
hg-git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
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
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
hg-git
Commits
338e4e5ba6dc
Commit
338e4e5ba6dc
authored
4 years ago
by
Dan Villiom Podlaski Christiansen
Browse files
Options
Downloads
Patches
Plain Diff
test-pull: add test for pulling branch deletion
parent
19d34b8f69da
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test-pull.t
+3
-1
3 additions, 1 deletion
tests/test-pull.t
with
3 additions
and
1 deletion
tests/test-pull.t
+
3
−
1
View file @
338e4e5b
...
...
@@ -124,10 +124,10 @@
date:
Mon
Jan
01
00
:
00
:
10
2007
+
0000
summary:
add
alpha
add
a
merge
to
the
git
repo
add
a
merge
to
the
git
repo
,
and
delete
the
branch
$
cd
gitrepo
$
git
merge
-
m "Merge branch 'beta'"
beta
|
sed
'
s/| */| /
'
Merge
made
by
the
'
recursive
'
strategy
.
beta
|
1
+
1
file
changed
,
1
insertion
(
+
)
create
mode
100644
beta
...
...
@@ -128,9 +128,11 @@
$
cd
gitrepo
$
git
merge
-
m "Merge branch 'beta'"
beta
|
sed
'
s/| */| /
'
Merge
made
by
the
'
recursive
'
strategy
.
beta
|
1
+
1
file
changed
,
1
insertion
(
+
)
create
mode
100644
beta
$
git
branch
-
d
beta
Deleted
branch
beta
(
was
9497
a4e
)
.
$
cd
..
pull
the
merge
...
...
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