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
878ae1d1bd73
Commit
878ae1d1bd73
authored
12 years ago
by
David M. Carr
Browse files
Options
Downloads
Patches
Plain Diff
tests: remove use of git-daemon in test-subrepos
This change was already applied to all the other tests.
parent
336c031a0484
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test-subrepos.t
+6
-14
6 additions, 14 deletions
tests/test-subrepos.t
with
6 additions
and
14 deletions
tests/test-subrepos.t
+
6
−
14
View file @
878ae1d1
...
...
@@ -63,13 +63,5 @@
$
cd
..
$
echo
$
git
daemon
--
base
-
path
=
"
$(pwd)
"
\
>
--
listen
=
localhost
\
>
--
export
-
all
\
>
--
pid
-
file
=
"
$DAEMON_PIDS
"
\
>
--
detach
--
reuseaddr
\
>
--
enable
=
receive
-
pack
$
echo
%
Ensure
gitlinks
are
transformed
to
.
hgsubstate
on
hg
pull
from
git
%
Ensure
gitlinks
are
transformed
to
.
hgsubstate
on
hg
pull
from
git
...
...
@@ -74,5 +66,5 @@
$
echo
%
Ensure
gitlinks
are
transformed
to
.
hgsubstate
on
hg
pull
from
git
%
Ensure
gitlinks
are
transformed
to
.
hgsubstate
on
hg
pull
from
git
$
hg
clone
git:
//local
host
/
gitrepo1
hgrepo
$
hg
clone
gitrepo1
hgrepo
importing
git
objects
into
hg
updating
to
branch
default
...
...
@@ -77,7 +69,7 @@
importing
git
objects
into
hg
updating
to
branch
default
cloning
subrepo
subrepo1
from
git:
//local
host
/
gitsubrepo
cloning
subrepo
xyz
/subrepo2 from
git://localhost
/gi
tsubrepo
cloning
subrepo
subrepo1
from
$TESTTMP
/
gitsubrepo
cloning
subrepo
xyz
/subrepo2 from
$TESTTMP
/gi
tsubrepo
4
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
cd
hgrepo
$
hg
bookmarks
-
f
-
r
default
master
...
...
@@ -111,7 +103,7 @@
$
cd
hgrepo
$
cd
xyz
/
subrepo2
$
git
pull
|
sed
'
s/files/file/;s/insertions/insertion/;s/, 0 deletions.*//
'
|
sed
'
s/| */| /
'
From
git:
//local
host
/
gitsubrepo
From
$TESTTMP
/
gitsubrepo
56
f0304
..
aabf7cd
master
->
origin
/
master
Updating
56
f0304
..
aabf7cd
Fast
-
forward
...
...
@@ -122,7 +114,7 @@
$
echo
xxx
>>
alpha
$
hg
commit
-
m 'Update subrepo2 from hg'
|
grep
-
v
"
committing subrepository
"
||
true
$
hg
push
pushing
to
git:
//local
host
/
gitrepo1
pushing
to
$TESTTMP
/
gitrepo1
exporting
hg
objects
to
git
creating
and
sending
data
default::
refs
/heads/mas
ter
=>
GIT:4663c492
...
...
@@ -155,7 +147,7 @@
$ gitcommit -m "Test3. Prepare .hgsub and .hgsubstate sources"
$ cd ../hgrepo
$ hg pull
pulling from
git://localhost
/gitrepo1
pulling from
$TESTTMP
/gitrepo1
importing git objects into hg
(run
'
hg
update
'
to get a working copy)
$ hg checkout -C | sed "s_$(dirname $(pwd))_TEMPLOCATION_"
...
...
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