Skip to content
Snippets Groups Projects
Commit 370d9ea0 authored by Katsunori FUJIWARA's avatar Katsunori FUJIWARA
Browse files

icasefs: refactor "test-casecollision-merge.t" to reuse in succeeding fixes

This patch refactors "test-casecollision-merge.t" to increase
reusability in succeeding patches.

It is confirmed that changed test also can detect issue3370.
parent 0176d0db
No related branches found
No related tags found
No related merge requests found
......@@ -20,9 +20,9 @@
$ hg rename a tmp
$ hg rename tmp A
$ hg commit -m '#1'
$ hg update 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo 'modified at #2' > a
$ hg update -q 0
$ touch x
$ hg add x
$ hg commit -m '#2'
created new head
......@@ -26,9 +26,6 @@
$ hg commit -m '#2'
created new head
$ hg merge
merging a and A to A
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg merge -q
$ hg status -A
M A
......@@ -33,4 +30,3 @@
$ hg status -A
M A
a
R a
......@@ -36,4 +32,3 @@
R a
$ cat A
modified at #2
C x
......@@ -39,8 +34,4 @@
$ hg update --clean 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge
merging A and a to A
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg update -q --clean 1
$ hg merge -q
$ hg status -A
......@@ -46,8 +37,6 @@
$ hg status -A
M A
a
$ cat A
modified at #2
M x
C A
$ cd ..
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment