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
3956ea942492
Commit
3956ea942492
authored
13 years ago
by
Nicolas Dumazet
Browse files
Options
Downloads
Patches
Plain Diff
tests: remove test-issue322 as it's fully included in test-issue660
parent
c0e29e10b9ef
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-issue322.t
+0
-59
0 additions, 59 deletions
tests/test-issue322.t
tests/test-issue660.t
+2
-1
2 additions, 1 deletion
tests/test-issue660.t
with
2 additions
and
60 deletions
tests/test-issue322.t
deleted
100644 → 0
+
0
−
59
View file @
c0e29e10
http:
//m
ercurial
.
selenic
.
com
/bts/issu
e322
File
replaced
with
directory:
$
hg
init
a
$
cd
a
$
echo
a
>
a
$
hg
commit
-
Ama
adding
a
$
rm
a
$
mkdir
a
$
echo
a
>
a
/
a
Should
fail
-
would
corrupt
dirstate:
$
hg
add
a
/
a
abort:
file
'
a
'
in
dirstate
clashes
with
'
a/a
'
[
255
]
$
cd
..
Directory
replaced
with
file:
$
hg
init
c
$
cd
c
$
mkdir
a
$
echo
a
>
a
/
a
$
hg
commit
-
Ama
adding
a
/
a
$
rm
-
r
a
$
echo
a
>
a
Should
fail
-
would
corrupt
dirstate:
$
hg
add
a
abort:
directory
'
a
'
already
in
dirstate
[
255
]
$
cd
..
Directory
replaced
with
file:
$
hg
init
d
$
cd
d
$
mkdir
b
$
mkdir
b
/
c
$
echo
a
>
b
/c/d
$
hg
commit
-
Ama
adding
b
/c/d
$
rm
-
r
b
$
echo
a
>
b
Should
fail
-
would
corrupt
dirstate:
$
hg
add
b
abort:
directory
'
b
'
already
in
dirstate
[
255
]
This diff is collapsed.
Click to expand it.
tests/test-issue660.t
+
2
−
1
View file @
3956ea94
http:
//m
ercurial
.
selenic
.
com
/bts/issu
e660
http:
//m
ercurial
.
selenic
.
com
/bts/issu
e660
and
:
http:
//m
ercurial
.
selenic
.
com
/bts/issu
e322
$
hg
init
$
echo
a
>
a
...
...
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