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
54dbf16b
Commit
54dbf16b
authored
14 years ago
by
Martin Geisler
Browse files
Options
Downloads
Patches
Plain Diff
tests: unify test-addremove
parent
95a93161
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-addremove.out
+0
-22
0 additions, 22 deletions
tests/test-addremove.out
tests/test-addremove.t
+46
-26
46 additions, 26 deletions
tests/test-addremove.t
with
46 additions
and
48 deletions
tests/test-addremove.out
deleted
100644 → 0
+
0
−
22
View file @
95a93161
adding dir/bar
adding foo
dir/bar
foo
committed changeset 0:d44511117907
adding dir/bar_2
adding foo_2
dir/bar_2
foo_2
committed changeset 1:a85812e0561a
adding a
adding c
removing a
adding b
removing c
adding d
recording removal of a as rename to b (100% similar)
removing a
adding b
removing c
adding d
recording removal of a as rename to b (100% similar)
This diff is collapsed.
Click to expand it.
tests/test-addremove
→
tests/test-addremove
.t
100755 → 100644
+
46
−
26
View file @
54dbf16b
#!/bin/sh
hg init rep
cd
rep
mkdir dir
touch
foo
dir
/bar
hg
-v
addremove
hg
-v
commit
-m
"add 1"
-d
"1000000 0"
cd dir
/
touch
../foo_2 bar_2
hg
-v
addremove
hg
-v
commit
-m
"add 2"
-d
"1000000 0"
$
hg
init
rep
$
cd
rep
$
mkdir
dir
$
touch
foo
dir
/
bar
$
hg
-
v
addremove
adding
dir
/
bar
adding
foo
$
hg
-
v
commit
-
m "add 1"
-
d
"
1000000 0
"
dir
/
bar
foo
committed
changeset
0
:
d44511117907
$
cd
dir
/
$
touch
../
foo_2
bar_2
$
hg
-
v
addremove
adding
dir
/
bar_2
adding
foo_2
$
hg
-
v
commit
-
m "add 2"
-
d
"
1000000 0
"
dir
/
bar_2
foo_2
committed
changeset
1
:
a85812e0561a
...
...
@@ -13,15 +21,27 @@
cd
..
hg init sim
cd
sim
echo
a
>
a
echo
a
>>
a
echo
a
>>
a
echo
c
>
c
hg commit
-Ama
mv
a b
rm
c
echo
d
>
d
hg addremove
-n
-s
50
# issue 1696
hg addremove
-s
50
hg commit
-mb
$
cd
..
$
hg
init
sim
$
cd
sim
$
echo
a
>
a
$
echo
a
>>
a
$
echo
a
>>
a
$
echo
c
>
c
$
hg
commit
-
Ama
adding
a
adding
c
$
mv
a
b
$
rm
c
$
echo
d
>
d
$
hg
addremove
-
n
-
s
50
# issue 1696
removing
a
adding
b
removing
c
adding
d
recording
removal
of
a
as
rename
to
b
(
100
%
similar
)
$
hg
addremove
-
s
50
removing
a
adding
b
removing
c
adding
d
recording
removal
of
a
as
rename
to
b
(
100
%
similar
)
$
hg
commit
-
mb
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