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
f22b101e
Commit
f22b101e
authored
14 years ago
by
Martin Geisler
Browse files
Options
Downloads
Patches
Plain Diff
tests: unify test-bundle-r
parent
33eb803e
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-bundle-r.out
+0
-250
0 additions, 250 deletions
tests/test-bundle-r.out
tests/test-bundle-r.t
+361
-116
361 additions, 116 deletions
tests/test-bundle-r.t
with
361 additions
and
366 deletions
tests/test-bundle-r.out
deleted
100644 → 0
+
0
−
250
View file @
33eb803e
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
rev offset length base linkrev nodeid p1 p2
0 0 3 0 0 362fef284ce2 000000000000 000000000000
1 3 5 1 1 125144f7e028 362fef284ce2 000000000000
2 8 7 2 2 4c982badb186 125144f7e028 000000000000
3 15 9 3 3 19b1fc555737 4c982badb186 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 75 0 7 2565f3199a74 000000000000 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 75 0 8 2565f3199a74 000000000000 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 48 0 0 43eadb1d2d06 000000000000 000000000000
1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000
2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000
3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000
4 192 58 3 6 de68e904d169 626a32663c2f 000000000000
5 250 68 3 7 09bb521d218d de68e904d169 000000000000
6 318 54 6 8 1fde233dfb0f f54c32f13478 000000000000
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
searching for changes
1 changesets found
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
0:5649c9d34dd8
searching for changes
2 changesets found
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
1:10b2180f755b
searching for changes
3 changesets found
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
2:d62976ca1e50
searching for changes
4 changesets found
adding changesets
adding manifests
adding file changes
added 4 changesets with 4 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 4 changesets, 4 total revisions
3:ac69c658229d
searching for changes
2 changesets found
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
1:5f4f3ceb285e
searching for changes
3 changesets found
adding changesets
adding manifests
adding file changes
added 3 changesets with 3 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 3 changesets, 3 total revisions
2:024e4e7df376
searching for changes
4 changesets found
adding changesets
adding manifests
adding file changes
added 4 changesets with 5 changes to 2 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 4 changesets, 5 total revisions
3:1e3f6b843bd6
searching for changes
5 changesets found
adding changesets
adding manifests
adding file changes
added 5 changesets with 6 changes to 3 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
3 files, 5 changesets, 6 total revisions
4:27f57c869697
searching for changes
5 changesets found
adding changesets
adding manifests
adding file changes
added 5 changesets with 5 changes to 2 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 5 total revisions
4:088ff9d6e1e1
pulling from ../test-7
searching for changes
adding changesets
adding manifests
adding file changes
added 4 changesets with 2 changes to 3 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
rolling back to revision 4 (undo pull)
% should fail
abort: --base is incompatible with specifying a destination
abort: repository default-push not found!
2 changesets found
4 changesets found
6 changesets found
1 changesets found
no changes found
1 changesets found
4 changesets found
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% 2
2:d62976ca1e50
adding changesets
transaction abort!
rollback completed
abort: 00changelog.i@ac69c658229d: unknown parent!
% 2
2:d62976ca1e50
adding changesets
adding manifests
adding file changes
added 6 changesets with 4 changes to 4 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
% 8
8:088ff9d6e1e1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 9 changesets, 7 total revisions
rolling back to revision 2 (undo unbundle)
% 2
2:d62976ca1e50
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
(run 'hg update' to get a working copy)
% 4
4:088ff9d6e1e1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 5 total revisions
rolling back to revision 2 (undo unbundle)
adding changesets
adding manifests
adding file changes
added 4 changesets with 3 changes to 3 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
% 6
6:27f57c869697
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
3 files, 7 changesets, 6 total revisions
rolling back to revision 2 (undo unbundle)
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
(run 'hg update' to get a working copy)
% 4
4:088ff9d6e1e1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 5 changesets, 5 total revisions
warning: detected divergent renames of afile to:
anotherfile
adifferentfile
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
7 changesets found
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding changesets
adding manifests
adding file changes
added 7 changesets with 4 changes to 4 files
(run 'hg update' to get a working copy)
% 9
9:e3061ea42e4c
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 10 changesets, 7 total revisions
This diff is collapsed.
Click to expand it.
tests/test-bundle-r
→
tests/test-bundle-r
.t
100755 → 100644
+
361
−
116
View file @
f22b101e
#!/bin/sh
$
hg
init
test
$
cd
test
$
echo
"
0
"
>>
afile
$
hg
add
afile
$
hg
commit
-
m "0.0"
-
d
"
1000000 0
"
$
echo
"
1
"
>>
afile
$
hg
commit
-
m "0.1"
-
d
"
1000000 0
"
$
echo
"
2
"
>>
afile
$
hg
commit
-
m "0.2"
-
d
"
1000000 0
"
$
echo
"
3
"
>>
afile
$
hg
commit
-
m "0.3"
-
d
"
1000000 0
"
$
hg
update
-
C
0
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
echo
"
1
"
>>
afile
$
hg
commit
-
m "1.1"
-
d
"
1000000 0
"
created
new
head
$
echo
"
2
"
>>
afile
$
hg
commit
-
m "1.2"
-
d
"
1000000 0
"
$
echo
"
a line
"
>
fred
$
echo
"
3
"
>>
afile
$
hg
add
fred
$
hg
commit
-
m "1.3"
-
d
"
1000000 0
"
$
hg
mv
afile
adifferentfile
$
hg
commit
-
m "1.3m"
-
d
"
1000000 0
"
$
hg
update
-
C
3
1
files
updated
,
0
files
merged
,
2
files
removed
,
0
files
unresolved
$
hg
mv
afile
anotherfile
$
hg
commit
-
m "0.3m"
-
d
"
1000000 0
"
$
hg
debugindex
.
hg
/store/da
ta
/
afile
.
i
rev
offset
length
base
linkrev
nodeid
p1
p2
0
0
3
0
0
362
fef284ce2
000000000000
000000000000
1
3
5
1
1
125144
f7e028
362
fef284ce2
000000000000
2
8
7
2
2
4
c982badb186
125144
f7e028
000000000000
3
15
9
3
3
19
b1fc555737
4
c982badb186
000000000000
$
hg
debugindex
.
hg
/store/da
ta
/
adifferentfile
.
i
rev
offset
length
base
linkrev
nodeid
p1
p2
0
0
75
0
7
2565
f3199a74
000000000000
000000000000
$
hg
debugindex
.
hg
/store/da
ta
/
anotherfile
.
i
rev
offset
length
base
linkrev
nodeid
p1
p2
0
0
75
0
8
2565
f3199a74
000000000000
000000000000
$
hg
debugindex
.
hg
/store/da
ta
/
fred
.
i
rev
offset
length
base
linkrev
nodeid
p1
p2
0
0
8
0
6
12
ab3bcc5ea4
000000000000
000000000000
$
hg
debugindex
.
hg
/store/
00
manifest
.
i
rev
offset
length
base
linkrev
nodeid
p1
p2
0
0
48
0
0
43
eadb1d2d06
000000000000
000000000000
1
48
48
1
1
8
b89697eba2c
43
eadb1d2d06
000000000000
2
96
48
2
2
626
a32663c2f
8
b89697eba2c
000000000000
3
144
48
3
3
f54c32f13478
626
a32663c2f
000000000000
4
192
58
3
6
de68e904d169
626
a32663c2f
000000000000
5
250
68
3
7
09
bb521d218d
de68e904d169
000000000000
6
318
54
6
8
1
fde233dfb0f
f54c32f13478
000000000000
$
hg
verify
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
4
files
,
9
changesets
,
7
total
revisions
$
cd
..
$
for
i
in
0
1
2
3
4
5
6
7
8
;
do
>
mkdir
test
-
"
$i
"
>
hg
--
cwd
test
-
"
$i
"
init
>
hg
-
R
test
bundle
-
r
"
$i
"
test
-
"
$i
"
.
hg
test
-
"
$i
"
>
cd
test
-
"
$i
"
>
hg
unbundle
../
test
-
"
$i
"
.
hg
>
hg
verify
>
hg
tip
-
q
> cd ..
>
done
searching
for
changes
1
changesets
found
adding
changesets
adding
manifests
adding
file
changes
added
1
changesets
with
1
changes
to
1
files
(
run
'
hg update
'
to
get
a
working
copy
)
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
1
files
,
1
changesets
,
1
total
revisions
0
:
5649
c9d34dd8
searching
for
changes
2
changesets
found
adding
changesets
adding
manifests
adding
file
changes
added
2
changesets
with
2
changes
to
1
files
(
run
'
hg update
'
to
get
a
working
copy
)
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
1
files
,
2
changesets
,
2
total
revisions
1
:
10
b2180f755b
searching
for
changes
3
changesets
found
adding
changesets
adding
manifests
adding
file
changes
added
3
changesets
with
3
changes
to
1
files
(
run
'
hg update
'
to
get
a
working
copy
)
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
1
files
,
3
changesets
,
3
total
revisions
2
:
d62976ca1e50
searching
for
changes
4
changesets
found
adding
changesets
adding
manifests
adding
file
changes
added
4
changesets
with
4
changes
to
1
files
(
run
'
hg update
'
to
get
a
working
copy
)
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
1
files
,
4
changesets
,
4
total
revisions
3
:
ac69c658229d
searching
for
changes
2
changesets
found
adding
changesets
adding
manifests
adding
file
changes
added
2
changesets
with
2
changes
to
1
files
(
run
'
hg update
'
to
get
a
working
copy
)
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
1
files
,
2
changesets
,
2
total
revisions
1
:
5
f4f3ceb285e
searching
for
changes
3
changesets
found
adding
changesets
adding
manifests
adding
file
changes
added
3
changesets
with
3
changes
to
1
files
(
run
'
hg update
'
to
get
a
working
copy
)
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
1
files
,
3
changesets
,
3
total
revisions
2
:
024
e4e7df376
searching
for
changes
4
changesets
found
adding
changesets
adding
manifests
adding
file
changes
added
4
changesets
with
5
changes
to
2
files
(
run
'
hg update
'
to
get
a
working
copy
)
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
2
files
,
4
changesets
,
5
total
revisions
3
:
1e3
f6b843bd6
searching
for
changes
5
changesets
found
adding
changesets
adding
manifests
adding
file
changes
added
5
changesets
with
6
changes
to
3
files
(
run
'
hg update
'
to
get
a
working
copy
)
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
3
files
,
5
changesets
,
6
total
revisions
4
:
27
f57c869697
searching
for
changes
5
changesets
found
adding
changesets
adding
manifests
adding
file
changes
added
5
changesets
with
5
changes
to
2
files
(
run
'
hg update
'
to
get
a
working
copy
)
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
2
files
,
5
changesets
,
5
total
revisions
4
:
088
ff9d6e1e1
$
cd
test
-
8
$
hg
pull
../
test
-
7
pulling
from
../
test
-
7
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
4
changesets
with
2
changes
to
3
files
(
+
1
heads
)
(
run
'
hg heads
'
to
see
heads
,
'
hg merge
'
to
merge
)
$
hg
verify
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
4
files
,
9
changesets
,
7
total
revisions
$
hg
rollback
rolling
back
to
revision
4
(
undo
pull
)
$
cd
..
...
@@ -2,65 +205,82 @@
...
@@ -2,65 +205,82 @@
hg init
test
should
fail
cd test
cat
>>
afile
<<
EOF
$
hg
-
R
test
bundle
--
base
2
-
r
tip
test
-
bundle
-
branch1
.
hg
test
-
3
0
abort:
--
base
is
incompatible
with
specifying
a
destination
EOF
$
hg
-
R
test
bundle
-
r
tip
test
-
bundle
-
branch1
.
hg
hg add afile
abort:
repository
default
-
push
not
found
!
hg commit
-m
"0.0"
-d
"1000000 0"
cat
>>
afile
<<
EOF
$
hg
-
R
test
bundle
--
base
2
-
r
tip
test
-
bundle
-
branch1
.
hg
1
2
changesets
found
EOF
$
hg
-
R
test
bundle
--
base
2
-
r
7
test
-
bundle
-
branch2
.
hg
hg commit
-m
"0.1"
-d
"1000000 0"
4
changesets
found
cat
>>
afile
<<
EOF
$
hg
-
R
test
bundle
--
base
2
test
-
bundle
-
all
.
hg
2
6
changesets
found
EOF
$
hg
-
R
test
bundle
--
base
3
-
r
tip
test
-
bundle
-
should
-
fail
.
hg
hg commit
-m
"0.2"
-d
"1000000 0"
1
changesets
found
cat
>>
afile
<<
EOF
3
empty
bundle
EOF
hg commit
-m
"0.3"
-d
"1000000 0"
$
hg
-
R
test
bundle
--
base
7
--
base
8
test
-
bundle
-
empty
.
hg
hg update
-C
0
no
changes
found
cat
>>
afile
<<
EOF
1
issue76
msg2163
EOF
hg commit
-m
"1.1"
-d
"1000000 0"
$
hg
-
R
test
bundle
--
base
3
-
r
3
-
r
3
test
-
bundle
-
cset
-
3
.
hg
cat
>>
afile
<<
EOF
1
changesets
found
2
EOF
issue1910
hg commit
-m
"1.2"
-d
"1000000 0"
cat
>
fred
<<
EOF
$
hg
-
R
test
bundle
--
base
7
test
-
bundle
-
cset
-
7
.
hg
a line
4
changesets
found
EOF
cat
>>
afile
<<
EOF
$
hg
clone
test
-
2
test
-
9
3
updating
to
branch
default
EOF
1
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
hg add fred
$
cd
test
-
9
hg commit
-m
"1.3"
-d
"1000000 0"
hg
mv
afile adifferentfile
revision
2
hg commit
-m
"1.3m"
-d
"1000000 0"
hg update
-C
3
$
hg
tip
-
q
hg
mv
afile anotherfile
2:d62976ca1e50
hg commit
-m
"0.3m"
-d
"1000000 0"
$
hg
unbundle
../
test
-
bundle
-
should
-
fail
.
hg
hg debugindex .hg/store/data/afile.i
adding
changesets
hg debugindex .hg/store/data/adifferentfile.i
transaction
abort
!
hg debugindex .hg/store/data/anotherfile.i
rollback
completed
hg debugindex .hg/store/data/fred.i
abort:
00
changelog
.
i@ac69c658229d:
unknown
parent
!
hg debugindex .hg/store/00manifest.i
hg verify
revision
2
cd
..
for
i
in
0 1 2 3 4 5 6 7 8
;
do
$
hg
tip
-
q
mkdir
test-
"
$i
"
2:d62976ca1e50
hg
--cwd
test-
"
$i
"
init
$
hg
unbundle
../
test
-
bundle
-
all
.
hg
hg
-R
test
bundle
-r
"
$i
"
test-
"
$i
"
.hg test-
"
$i
"
adding
changesets
cd
test-
"
$i
"
adding
manifests
hg unbundle ../test-
"
$i
"
.hg
adding
file
changes
hg verify
added
6
changesets
with
4
changes
to
4
files
(
+
1
heads
)
hg tip
-q
(
run
'
hg heads
'
to
see
heads
,
'
hg merge
'
to
merge
)
cd
..
done
revision
8
cd
test-8
hg pull ../test-7
$
hg
tip
-
q
hg verify
8:088ff9d6e1e1
hg rollback
$
hg
verify
cd
..
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
4
files
,
9
changesets
,
7
total
revisions
$
hg
rollback
rolling
back
to
revision
2
(
undo
unbundle
)
revision
2
$
hg
tip
-
q
2:d62976ca1e50
$
hg
unbundle
../
test
-
bundle
-
branch1
.
hg
adding
changesets
adding
manifests
adding
file
changes
added
2
changesets
with
2
changes
to
2
files
(
run
'
hg update
'
to
get
a
working
copy
)
...
@@ -66,5 +286,20 @@
...
@@ -66,5 +286,20 @@
echo
% should fail
revision
4
hg
-R
test
bundle
--base
2
-r
tip test-bundle-branch1.hg test-3
hg
-R
test
bundle
-r
tip test-bundle-branch1.hg
$
hg
tip
-
q
4:088ff9d6e1e1
$
hg
verify
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
2
files
,
5
changesets
,
5
total
revisions
$
hg
rollback
rolling
back
to
revision
2
(
undo
unbundle
)
$
hg
unbundle
../
test
-
bundle
-
branch2
.
hg
adding
changesets
adding
manifests
adding
file
changes
added
4
changesets
with
3
changes
to
3
files
(
+
1
heads
)
(
run
'
hg heads
'
to
see
heads
,
'
hg merge
'
to
merge
)
...
@@ -70,8 +305,3 @@
...
@@ -70,8 +305,3 @@
hg
-R
test
bundle
--base
2
-r
tip test-bundle-branch1.hg
revision
6
hg
-R
test
bundle
--base
2
-r
7 test-bundle-branch2.hg
hg
-R
test
bundle
--base
2 test-bundle-all.hg
hg
-R
test
bundle
--base
3
-r
tip test-bundle-should-fail.hg
# empty bundle
hg
-R
test
bundle
--base
7
--base
8 test-bundle-empty.hg
...
@@ -77,6 +307,20 @@
...
@@ -77,6 +307,20 @@
# issue76 msg2163
$
hg
tip
-
q
hg
-R
test
bundle
--base
3
-r
3
-r
3 test-bundle-cset-3.hg
6:27f57c869697
# issue1910
$
hg
verify
hg
-R
test
bundle
--base
7 test-bundle-cset-7.hg
checking
changesets
checking
manifests
crosschecking
files
in
changesets
and
manifests
checking
files
3
files
,
7
changesets
,
6
total
revisions
$
hg
rollback
rolling
back
to
revision
2
(
undo
unbundle
)
$
hg
unbundle
../
test
-
bundle
-
cset
-
7
.
hg
adding
changesets
adding
manifests
adding
file
changes
added
2
changesets
with
2
changes
to
2
files
(
run
'
hg update
'
to
get
a
working
copy
)
revision
4
...
@@ -82,30 +326,10 @@
...
@@ -82,30 +326,10 @@
hg clone test-2 test-9
$
hg
tip
-
q
cd
test-9
4:088ff9d6e1e1
echo
% 2
$
hg
verify
hg tip
-q
checking
changesets
hg unbundle ../test-bundle-should-fail.hg
checking
manifests
echo
% 2
crosschecking
files
in
changesets
and
manifests
hg tip
-q
checking
files
hg unbundle ../test-bundle-all.hg
2
files
,
5
changesets
,
5
total
revisions
echo
% 8
hg tip
-q
hg verify
hg rollback
echo
% 2
hg tip
-q
hg unbundle ../test-bundle-branch1.hg
echo
% 4
hg tip
-q
hg verify
hg rollback
hg unbundle ../test-bundle-branch2.hg
echo
% 6
hg tip
-q
hg verify
hg rollback
hg unbundle ../test-bundle-cset-7.hg
echo
% 4
hg tip
-q
hg verify
...
@@ -111,12 +335,33 @@
...
@@ -111,12 +335,33 @@
cd
../test
$
cd
../
test
hg merge 7
$
hg
merge
7
hg ci
-m
merge
-d
"1000000 0"
warning:
detected
divergent
renames
of
afile
to:
cd
..
anotherfile
hg
-R
test
bundle
--base
2 test-bundle-head.hg
adifferentfile
hg clone test-2 test-10
2
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
cd
test-10
(
branch
merge
,
don
'
t forget to commit)
hg unbundle ../test-bundle-head.hg
$ hg ci -m merge -d "1000000 0"
echo
% 9
$ cd ..
hg tip
-q
$ hg -R test bundle --base 2 test-bundle-head.hg
hg verify
7 changesets found
$ hg clone test-2 test-10
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd test-10
$ hg unbundle ../test-bundle-head.hg
adding changesets
adding manifests
adding file changes
added 7 changesets with 4 changes to 4 files
(run
'
hg
update
'
to get a working copy)
revision 9
$ hg tip -q
9:e3061ea42e4c
$ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
4 files, 10 changesets, 7 total revisions
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