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

icasefs: enhance test to prevent regression by changes in the future

This patch adds steps to test case-folding collision detection on the
revision tree built up in the order different from the one reproducing
issue3452.

This may prevent regression by changes around "copy detection" and/or
"case-folding collision detection" logic in the future.
parent c60a7f5a
No related branches found
No related tags found
No related merge requests found
......@@ -16,6 +16,8 @@
$ echo a > a
$ hg add a
$ echo b > b
$ hg add b
$ hg commit -m '#0'
$ hg tag -l A
$ hg rename a tmp
......@@ -33,6 +35,7 @@
$ hg status -A
M A
R a
C b
C x
$ hg update -q --clean 1
......@@ -40,6 +43,7 @@
$ hg status -A
M x
C A
C b
$ hg commit -m '(D)'
$ hg tag -l D
......@@ -64,6 +68,7 @@
$ hg update -q --clean C
$ echo "modify 'a' at (E)" > a
$ echo "modify 'b' at (E)" > b
$ hg commit -m '(E)'
created new head
$ hg tag -l E
......@@ -77,7 +82,8 @@
$ hg status -A
M A
a
M b
C x
$ cat A
modify 'a' at (E)
......@@ -80,7 +86,41 @@
C x
$ cat A
modify 'a' at (E)
test also the case that (B) is recorded after (C), to prevent
regression by changes in the future.
to avoid unexpected (successful) behavior by filelog unification,
target file is not 'a'/'A' but 'b'/'B' in this case.
$ hg update -q --clean A
$ hg rename b tmp
$ hg rename tmp B
$ hg commit -m '(B1)'
created new head
$ hg tag -l B1
$ hg merge -q C
$ hg status -A
M x
C B
C a
$ hg commit -m '(D1)'
$ hg tag -l D1
$ echo "modify 'B' at (F1)" > B
$ hg commit -m '(F1)'
$ hg tag -l F1
$ hg merge -q --tool internal:other E
$ hg status -A
M B
b
M a
C x
$ cat B
modify 'b' at (E)
$ cd ..
(2) colliding file is not related to collided file
......
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