Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hg-windows-ci
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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-windows-ci
Commits
2b34d004
Commit
2b34d004
authored
11 years ago
by
Kevin Bullock
Browse files
Options
Downloads
Patches
Plain Diff
subrepo: add regression test for issue3870
parent
811e2532
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-subrepo-git.t
+25
-0
25 additions, 0 deletions
tests/test-subrepo-git.t
with
25 additions
and
0 deletions
tests/test-subrepo-git.t
+
25
−
0
View file @
2b34d004
...
...
@@ -238,6 +238,31 @@
source ../gitroot
revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc
create a new git branch
$ cd s
$ git checkout -b b2
Switched to a new branch
'
b2
'
$ echo a>a
$ git add a
$ git commit -qm
'
add
a
'
$ cd ..
$ hg commit -m
'
add
branch
in
s'
pulling new git branch should not create tracking branch named 'origin/b2'
(
issue3870
)
$
cd
..
/td/s
$
git
remote
set
-
url
origin
$TESTTMP
/tb/s
$
cd
..
$
hg
pull
-
q ../tb
$
hg
up
From
$TESTTMP
/tb/s
*
[
new
branch
]
b2
->
origin
/
b2
Previous
HEAD
position
was
f47b465
...
merge
Switched
to
a
new
branch
'
b2
'
pulling
subrepo
s from $TESTTMP/tb/s
1 files updated, 0 fil
es
merged
,
0
files
removed
,
0
files
unresolved
update
to
a
revision
without
the
subrepo
,
keeping
the
local
git
repository
$
cd
../
t
...
...
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