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
47d2b4a5bd1e
Commit
47d2b4a5bd1e
authored
14 years ago
by
Nicolas Dumazet
Browse files
Options
Downloads
Patches
Plain Diff
tests: unify test-flags
parent
00cde9bddbe4
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tests/test-flags.out
+0
-100
0 additions, 100 deletions
tests/test-flags.out
tests/test-flags.t
+139
-40
139 additions, 40 deletions
tests/test-flags.t
with
139 additions
and
140 deletions
tests/test-flags.out
deleted
100644 → 0
+
0
−
100
View file @
00cde9bd
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../test1
requesting all changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 2 changes to 2 files
(run 'hg update' to get a working copy)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
% the changelog should mention file a:
a
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
changeset: 2:37dccb76c058
tag: tip
parent: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: chmod +x a
changeset: 1:a187cb361a5a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: a updated
changeset: 2:37dccb76c058
tag: tip
parent: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: chmod +x a
changeset: 1:a187cb361a5a
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: a updated
changeset: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: added a b
resolving manifests
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
changeset: 2:37dccb76c058
tag: tip
parent: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: chmod +x a
changeset: 1:d54568174d8e
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: b updated
changeset: 2:37dccb76c058
tag: tip
parent: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: chmod +x a
changeset: 1:d54568174d8e
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: b updated
changeset: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: added a b
resolving manifests
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-rwxr-x---
-rwxr-x---
-rwxr-x---
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
rev offset length base linkrev nodeid p1 p2
0 0 0 0 0 b80de5d13875 000000000000 000000000000
1 0 5 1 1 7fe919cc0336 b80de5d13875 000000000000
This diff is collapsed.
Click to expand it.
tests/test-flags
→
tests/test-flags
.t
100755 → 100644
+
139
−
40
View file @
47d2b4a5
#!/bin/sh -e
$
umask
027
$
mkdir
test1
$
cd
test1
...
...
@@ -2,5 +4,6 @@
umask
027
mkdir
test1
cd
test1
$
hg
init
$
touch
a
b
$
hg
add
a
b
$
hg
ci
-
m "added a b"
-
d
"
1000000 0
"
...
...
@@ -6,6 +9,8 @@
hg init
touch
a b
hg add a b
hg ci
-m
"added a b"
-d
"1000000 0"
$
cd
..
$
hg
clone
test1
test3
updating
to
branch
default
2
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
mkdir
test2
$
cd
test2
...
...
@@ -11,6 +16,15 @@
cd
..
hg clone test1 test3
mkdir
test2
cd
test2
$
hg
init
$
hg
pull
../
test1
pulling
from
../
test1
requesting
all
changes
adding
changesets
adding
manifests
adding
file
changes
added
1
changesets
with
2
changes
to
2
files
(
run
'
hg update
'
to
get
a
working
copy
)
$
hg
co
2
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
$
chmod
+
x
a
$
hg
ci
-
m "chmod +x a"
-
d
"
1000000 0
"
...
...
@@ -16,9 +30,10 @@
hg init
hg pull ../test1
hg co
chmod
+x a
hg ci
-m
"chmod +x a"
-d
"1000000 0"
echo
% the changelog should mention file a:
hg tip
--template
'{files}\n'
the
changelog
should
mention
file
a:
$
hg
tip
--
template
'
{files}\n
'
a
$
cd
../
test1
$
echo
123
>>
a
$
hg
ci
-
m "a updated"
-
d
"
1000000 0
"
...
...
@@ -24,5 +39,41 @@
cd
../test1
echo
123
>>
a
hg ci
-m
"a updated"
-d
"1000000 0"
$
hg
pull
../
test2
pulling
from
../
test2
searching
for
changes
adding
changesets
adding
manifests
adding
file
changes
added
1
changesets
with
0
changes
to
0
files
(
+
1
heads
)
(
run
'
hg heads
'
to
see
heads
,
'
hg merge
'
to
merge
)
$
hg
heads
changeset:
2
:
37
dccb76c058
tag:
tip
parent:
0
:
4536
b1c2ca69
user:
test
date:
Mon
Jan
12
13
:
46
:
40
1970
+
0000
summary:
chmod
+
x
a
changeset:
1
:
a187cb361a5a
user:
test
date:
Mon
Jan
12
13
:
46
:
40
1970
+
0000
summary:
a
updated
$
hg
history
changeset:
2
:
37
dccb76c058
tag:
tip
parent:
0
:
4536
b1c2ca69
user:
test
date:
Mon
Jan
12
13
:
46
:
40
1970
+
0000
summary:
chmod
+
x
a
changeset:
1
:
a187cb361a5a
user:
test
date:
Mon
Jan
12
13
:
46
:
40
1970
+
0000
summary:
a
updated
changeset:
0
:
4536
b1c2ca69
user:
test
date:
Mon
Jan
12
13
:
46
:
40
1970
+
0000
summary:
added
a
b
...
...
@@ -28,5 +79,6 @@
hg pull ../test2
hg heads
hg
history
$
hg
-
v
merge
resolving
manifests
0
files
updated
,
0
files
merged
,
0
files
removed
,
0
files
unresolved
(
branch
merge
,
don
'
t forget to commit)
...
...
@@ -32,3 +84,5 @@
hg
-v
merge
$ cd ../test3
$ echo 123 >>b
$ hg ci -m "b updated" -d "1000000 0"
...
...
@@ -34,9 +88,41 @@
cd
../test3
echo
123
>>
b
hg ci
-m
"b updated"
-d
"1000000 0"
hg pull ../test2
hg heads
hg
history
$ hg pull ../test2
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run
'
hg
heads
'
to see heads,
'
hg
merge
'
to merge)
$ hg heads
changeset: 2:37dccb76c058
tag: tip
parent: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: chmod +x a
changeset: 1:d54568174d8e
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: b updated
$ hg history
changeset: 2:37dccb76c058
tag: tip
parent: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: chmod +x a
changeset: 1:d54568174d8e
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: b updated
changeset: 0:4536b1c2ca69
user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: added a b
...
...
@@ -42,3 +128,12 @@
hg
-v
merge
$ hg -v merge
resolving manifests
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don
'
t
forget
to
commit
)
$
ls
-
l
..
/test[123]/a
>
foo
$
cut
-
b
1
-
10
<
foo
-
rwxr
-
x
---
-
rwxr
-
x
---
-
rwxr
-
x
---
...
...
@@ -44,7 +139,11 @@
ls
-l
../test[123]/a
>
foo
cut
-b
1-10 < foo
hg debugindex .hg/store/data/a.i
hg debugindex ../test2/.hg/store/data/a.i
hg debugindex ../test1/.hg/store/data/a.i
$
hg
debugindex
.
hg
/store/da
ta
/
a
.
i
rev
offset
length
base
linkrev
nodeid
p1
p2
0
0
0
0
0
b80de5d13875
000000000000
000000000000
$
hg
debugindex
..
/test2/
.
hg
/store/da
ta
/
a
.
i
rev
offset
length
base
linkrev
nodeid
p1
p2
0
0
0
0
0
b80de5d13875
000000000000
000000000000
$
hg
debugindex
..
/test1/
.
hg
/store/da
ta
/
a
.
i
rev
offset
length
base
linkrev
nodeid
p1
p2
0
0
0
0
0
b80de5d13875
000000000000
000000000000
1
0
5
1
1
7
fe919cc0336
b80de5d13875
000000000000
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