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
f6d5d017
Commit
f6d5d017
authored
13 years ago
by
kiilerix
Browse files
Options
Downloads
Patches
Plain Diff
tests: cleanup of test-fetch.t
parent
1e945147
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-fetch.t
+42
-47
42 additions, 47 deletions
tests/test-fetch.t
with
42 additions
and
47 deletions
tests/test-fetch.t
+
42
−
47
View file @
f6d5d017
adjust
to
non
-
default
HGPORT
,
e
.
g
.
with
run
-
tests
.
py
-
j
$
echo
"
[extensions]
"
>>
$HGRCPATH
$
echo
"
fetch=
"
>>
$HGRCPATH
...
...
@@ -7,7 +5,7 @@
$
hg
init
a
$
echo
a
>
a
/
a
$
hg
--
cwd
a
commit
-
d
'
1 0
'
-
Ama
$
hg
--
cwd
a
commit
-
Ama
adding
a
$
hg
clone
a
b
updating
to
branch
default
...
...
@@ -16,6 +14,6 @@
updating
to
branch
default
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
b
>
a
/
b
$
hg
--
cwd
a
commit
-
d
'
2 0
'
-
Amb
$
hg
--
cwd
a
commit
-
Amb
adding
b
$
hg
--
cwd
a
parents
-
q
...
...
@@ -20,6 +18,6 @@
adding
b
$
hg
--
cwd
a
parents
-
q
1:
97d72e5f12c7
1:
d2ae7f538514
should
pull
one
change
...
...
@@ -32,5 +30,5 @@
added
1
changesets
with
1
changes
to
1
files
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
hg
--
cwd
b
parents
-
q
1:
97d72e5f12c7
1:
d2ae7f538514
$
echo
c
>
c
/
c
...
...
@@ -36,5 +34,5 @@
$
echo
c
>
c
/
c
$
hg
--
cwd
c
commit
-
d
'
3 0
'
-
Amc
$
hg
--
cwd
c
commit
-
Amc
adding
c
$
hg
clone
c
d
updating
to
branch
default
...
...
@@ -48,10 +46,10 @@
message
,
making
every
commit
appear
different
.
should
merge
c
into
a
$
hg
--
cwd
c
fetch
-
d
'
4
0
'
-
m 'automated merge'
../
a
$
hg
--
cwd
c
fetch
-
d
'
0
0
'
-
m 'automated merge'
../
a
pulling
from
../
a
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
1
changesets
with
1
changes
to
1
files
(
+
1
heads
)
...
...
@@ -52,8 +50,8 @@
pulling
from
../
a
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
1
changesets
with
1
changes
to
1
files
(
+
1
heads
)
updating
to
2
:
97
d72e5f12c7
updating
to
2
:
d2ae7f538514
1
files
updated
,
0
files
merged
,
1
files
removed
,
0
files
unresolved
...
...
@@ -59,3 +57,3 @@
1
files
updated
,
0
files
merged
,
1
files
removed
,
0
files
unresolved
merging
with
1
:
5e056962225
c
merging
with
1
:
d36c0562f908
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
...
...
@@ -61,6 +59,6 @@
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
new
changeset
3
:
cd3a41621cf0
merges
remote
changes
with
local
new
changeset
3
:
a323a0c43ec4
merges
remote
changes
with
local
$
ls
c
a
b
c
...
...
@@ -63,11 +61,9 @@
$
ls
c
a
b
c
$
netstat
-
tnap
2
>
/dev/null
|
grep
$HGPORT
|
grep
LISTEN
[
1
]
$
hg
--
cwd
a
serve
-
a
localhost
-
p
$HGPORT
-
d
--
pid
-
file
=
hg
.
pid
$
cat
a
/
hg
.
pid
>>
"
$DAEMON_PIDS
"
fetch
over
http
,
no
auth
...
...
@@ -69,12 +65,12 @@
$
hg
--
cwd
a
serve
-
a
localhost
-
p
$HGPORT
-
d
--
pid
-
file
=
hg
.
pid
$
cat
a
/
hg
.
pid
>>
"
$DAEMON_PIDS
"
fetch
over
http
,
no
auth
$
hg
--
cwd
d
fetch
-
d
'
5 0
'
http:
//local
host:$HGPORT
/
$
hg
--
cwd
d
fetch
http:
//local
host:$HGPORT
/
pulling
from
http:
//local
host:$HGPORT
/
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
1
changesets
with
1
changes
to
1
files
(
+
1
heads
)
...
...
@@ -75,8 +71,8 @@
pulling
from
http:
//local
host:$HGPORT
/
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
1
changesets
with
1
changes
to
1
files
(
+
1
heads
)
updating
to
2
:
97
d72e5f12c7
updating
to
2
:
d2ae7f538514
1
files
updated
,
0
files
merged
,
1
files
removed
,
0
files
unresolved
...
...
@@ -82,5 +78,5 @@
1
files
updated
,
0
files
merged
,
1
files
removed
,
0
files
unresolved
merging
with
1
:
5e056962225
c
merging
with
1
:
d36c0562f908
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
new
changeset
3
:
*
merges
remote
changes
with
local
(
glob
)
$
hg
--
cwd
d
tip
--
template
'
{desc}\n
'
...
...
@@ -88,10 +84,10 @@
fetch
over
http
with
auth
(
should
be
hidden
in
desc
)
$
hg
--
cwd
e
fetch
-
d
'
5 0
'
http:
//us
er:password@localhost:$HGPORT
/
$
hg
--
cwd
e
fetch
http:
//us
er:password@localhost:$HGPORT
/
pulling
from
http:
//us
er:***@localhost:$HGPORT
/
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
1
changesets
with
1
changes
to
1
files
(
+
1
heads
)
...
...
@@ -92,8 +88,8 @@
pulling
from
http:
//us
er:***@localhost:$HGPORT
/
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
1
changesets
with
1
changes
to
1
files
(
+
1
heads
)
updating
to
2
:
97
d72e5f12c7
updating
to
2
:
d2ae7f538514
1
files
updated
,
0
files
merged
,
1
files
removed
,
0
files
unresolved
...
...
@@ -99,5 +95,5 @@
1
files
updated
,
0
files
merged
,
1
files
removed
,
0
files
unresolved
merging
with
1
:
5e056962225
c
merging
with
1
:
d36c0562f908
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
new
changeset
3
:
*
merges
remote
changes
with
local
(
glob
)
$
hg
--
cwd
e
tip
--
template
'
{desc}\n
'
...
...
@@ -109,6 +105,6 @@
updating
to
branch
default
2
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
f
>
f
/
f
$
hg
--
cwd
f
ci
-
d
'
6 0
'
-
Amf
$
hg
--
cwd
f
ci
-
Amf
adding
f
$
echo
g
>
g
/
g
...
...
@@ -113,9 +109,9 @@
adding
f
$
echo
g
>
g
/
g
$
hg
--
cwd
g
ci
-
d
'
6 0
'
-
Amg
$
hg
--
cwd
g
ci
-
Amg
adding
g
$
hg
clone
-
q f
h
$
hg
clone
-
q g
i
should
merge
f
into
g
...
...
@@ -116,10 +112,10 @@
adding
g
$
hg
clone
-
q f
h
$
hg
clone
-
q g
i
should
merge
f
into
g
$
hg
--
cwd
g
fetch
-
d
'
7
0
'
--
switch
-
m 'automated merge'
../
f
$
hg
--
cwd
g
fetch
-
d
'
0
0
'
--
switch
-
m 'automated merge'
../
f
pulling
from
../
f
searching
for
changes
adding
changesets
...
...
@@ -127,5 +123,5 @@
adding
file
changes
added
1
changesets
with
1
changes
to
1
files
(
+
1
heads
)
0
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
merging
with
3
:
cc6a3744834d
merging
with
3
:
6343
ca3eff20
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
...
...
@@ -131,5 +127,5 @@
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
new
changeset
4
:
55
aa4f32ec59
merges
remote
changes
with
local
new
changeset
4
:
f7faa0b7d3c6
merges
remote
changes
with
local
$
rm
i
/
g
should
abort
,
because
i
is
modified
...
...
@@ -142,8 +138,8 @@
$
hg
init
nbase
$
echo
base
>
nbase
/
a
$
hg
-
R
nbase
ci
-
d
'
1 0
'
-
Am
base
$
hg
-
R
nbase
ci
-
Am
base
adding
a
$
hg
-
R
nbase
branch
a
marked
working
directory
as
branch
a
$
echo
a
>
nbase
/
a
...
...
@@ -146,10 +142,10 @@
adding
a
$
hg
-
R
nbase
branch
a
marked
working
directory
as
branch
a
$
echo
a
>
nbase
/
a
$
hg
-
R
nbase
ci
-
d
'
2 0
'
-
m a
$
hg
-
R
nbase
ci
-
m a
$ hg -R nbas
e
up
-
C
0
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
hg
-
R
nbase
branch
b
marked
working
directory
as
branch
b
$
echo
b
>
nbase
/
b
...
...
@@ -151,9 +147,9 @@
$ hg -R nbas
e
up
-
C
0
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
hg
-
R
nbase
branch
b
marked
working
directory
as
branch
b
$
echo
b
>
nbase
/
b
$
hg
-
R
nbase
ci
-
A
d
'
3 0
'
-
m b
$
hg
-
R
nbase
ci
-
Am
b
adding
b
pull
in
change
on
foreign
branch
...
...
@@ -167,6 +163,6 @@
$
hg
-
R
n1
up
-
C
a
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
aa
>
n1
/
a
$
hg
-
R
n1
ci
-
d
'
4 0
'
-
m a1
$
hg
-
R
n1
ci
-
m a1
$ hg -R n2 up -C b
1 files upda
ted
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
...
...
@@ -171,6 +167,6 @@
$ hg -R n2 up -C b
1 files upda
ted
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
hg
-
R
n2
fetch
-
d
'
9 0
'
-
m 'merge'
n1
$
hg
-
R
n2
fetch
-
m 'merge'
n1
pulling
from
n1
searching
for
changes
adding
changesets
...
...
@@ -195,7 +191,7 @@
$
hg
-
R
n1
up
-
C
a
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
aa
>
n1
/
a
$
hg
-
R
n1
ci
-
d
'
4 0
'
-
m a1
$
hg
-
R
n1
ci
-
m a1
$ hg -R n1 up -C b
2 files upda
ted
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
bb
>
n1
/
b
...
...
@@ -199,6 +195,6 @@
$ hg -R n1 up -C b
2 files upda
ted
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
bb
>
n1
/
b
$
hg
-
R
n1
ci
-
d
'
5 0
'
-
m b1
$
hg
-
R
n1
ci
-
m b1
$ hg -R n2 up -C b
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
...
...
@@ -203,6 +199,6 @@
$ hg -R n2 up -C b
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
hg
-
R
n2
fetch
-
d
'
9 0
'
-
m 'merge'
n1
$
hg
-
R
n2
fetch
-
m 'merge'
n1
pulling
from
n1
searching
for
changes
adding
changesets
...
...
@@ -229,7 +225,7 @@
$
hg
-
R
n1
up
-
C
a
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
a1
>
n1
/
a
$
hg
-
R
n1
ci
-
d
'
4 0
'
-
m a1
$
hg
-
R
n1
ci
-
m a1
$ hg -R n1 up -C b
2 files upda
ted
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
bb
>
n1
/
b
...
...
@@ -233,7 +229,7 @@
$ hg -R n1 up -C b
2 files upda
ted
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
bb
>
n1
/
b
$
hg
-
R
n1
ci
-
d
'
5 0
'
-
m b1
$
hg
-
R
n1
ci
-
m b1
$ hg -R n1 up -C 1
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo a2 > n1/a
...
...
@@ -237,8 +233,8 @@
$ hg -R n1 up -C 1
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo a2 > n1/a
$ hg -R n1 ci
-d '6 0'
-m a2
$ hg -R n1 ci -m a2
created new head
$ hg -R n2 up -C b
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
change
>>
n2
/
c
...
...
@@ -241,6 +237,6 @@
created new head
$ hg -R n2 up -C b
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
change
>>
n2
/
c
$
hg
-
R
n2
ci
-
A
d
'
7 0
'
-
m local
$
hg
-
R
n2
ci
-
A
-
m local
adding
c
...
...
@@ -246,8 +242,8 @@
adding
c
$
hg
-
R
n2
fetch
-
d
'
9
0
'
-
m 'merge'
n1
$
hg
-
R
n2
fetch
-
d
'
0
0
'
-
m 'merge'
n1
pulling
from
n1
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
3
changesets
with
3
changes
to
2
files
(
+
2
heads
)
...
...
@@ -248,8 +244,8 @@
pulling
from
n1
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
3
changesets
with
3
changes
to
2
files
(
+
2
heads
)
updating
to
5
:
708
c6cce3d26
updating
to
5
:
3
c4a837a864f
1
files
updated
,
0
files
merged
,
1
files
removed
,
0
files
unresolved
...
...
@@ -255,3 +251,3 @@
1
files
updated
,
0
files
merged
,
1
files
removed
,
0
files
unresolved
merging
with
3
:
d83427717b1f
merging
with
3
:
1267
f84a9ea5
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
...
...
@@ -257,5 +253,5 @@
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
new
changeset
7
:
48
f1a33f52af
merges
remote
changes
with
local
new
changeset
7
:
2
cf2a1261f21
merges
remote
changes
with
local
parent
should
be
7
(
new
merge
changeset
)
...
...
@@ -277,7 +273,7 @@
$
hg
-
R
n1
merge
b
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
(
branch
merge
,
don
'
t forget to commit)
$ hg -R n1 ci
-d
'
4
0
'
-m merge
$ hg -R n1 ci -m merge
$ hg -R n1 up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c > n1/a
...
...
@@ -281,7 +277,7 @@
$ hg -R n1 up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo c > n1/a
$ hg -R n1 ci
-d
'
5
0
'
-m c
$ hg -R n1 ci -m c
$ hg -R n1 up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo cc > n1/a
...
...
@@ -285,8 +281,8 @@
$ hg -R n1 up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo cc > n1/a
$ hg -R n1 ci
-d
'
6
0
'
-m cc
$ hg -R n1 ci -m cc
created new head
$ hg -R n2 up -C b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo change >> n2/b
...
...
@@ -289,9 +285,9 @@
created new head
$ hg -R n2 up -C b
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo change >> n2/b
$ hg -R n2 ci -A
d
'
7
0
'
-m local
$ hg -R n2 fetch
-d
'
9
0
'
-m
'
merge
'
n1
$ hg -R n2 ci -A -m local
$ hg -R n2 fetch -m
'
merge
'
n1
pulling from n1
searching for changes
adding changesets
...
...
@@ -320,7 +316,7 @@
$ hg -R n1 ci -m next
$ hg -R n2 branch topic
marked working directory as branch topic
$ hg -R n2 fetch
-d
'
0
0
'
-m merge n1
$ hg -R n2 fetch -m merge n1
abort: working dir not at branch tip (use "hg update" to check out branch tip)
[255]
...
...
@@ -407,4 +403,3 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
$ "$TESTDIR/killdaemons.py"
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