changeset 6094:c1094cce56ed

tests: avoid case-folding issue in test-evolve-inmemory.t on windows

When using debugdrawdag, each commit already creates a file with the same name
as the commit description, i.e. changeset C creates file C with 'C' in it (no
newline). Creating another file called c breaks this test on windows. So let's
reuse the files already created by debugdrawdag.

hg update reports one less file because now there's only C in C (yes, I also
wanted to change commit descriptions, file names and their contents to be less
ambiguous, but decided to be lazy).

--- a/tests/test-evolve-inmemory.t	Sat Nov 20 13:11:04 2021 +0300
+++ b/tests/test-evolve-inmemory.t	Thu Nov 18 17:29:20 2021 +0300
@@ -17,9 +17,9 @@
   $ hg init single-orphan
   $ cd single-orphan
   $ hg debugdrawdag <<'EOS'
-  >     C  # C/c = c\n
-  > B2  |  # B2/b = b2\n
-  > |   B  # B/b = b\n
+  >     C  # C/C = C\n
+  > B2  |  # B2/B = B2\n
+  > |   B  # B/B = B\n
   >  \ /   # replace: B -> B2
   >   A
   > EOS
@@ -28,19 +28,19 @@
   move:[3] C
   atop:[2] B2
   $ hg glog
-  o  4:52da76e91abb draft tip
+  o  4:a2a0434af50b draft tip
   |  C
-  | x  3:bc77848cde3a draft C
+  | x  3:46f17045c5ee draft C
   | |  C
-  o |  2:377a194b9b8a draft B2
+  o |  2:3d6c495db414 draft B2
   | |  B2
-  | x  1:830b6315076c draft B
+  | x  1:caf23a7900cb draft B
   |/   B
   o  0:426bada5c675 draft A
      A
-  $ hg cat -r tip b c
-  b2
-  c
+  $ hg cat -r tip B C
+  B2
+  C
   $ cd ..
 
 Test that in-memory evolve works when there are conflicts
@@ -49,13 +49,13 @@
   $ hg init conflicts
   $ cd conflicts
   $ hg debugdrawdag <<'EOS'
-  >     E  # E/e = e\n
+  >     E  # E/E = E\n
   >     |
-  >     D  # D/b = d\n
+  >     D  # D/B = D\n
   >     |
-  >     C  # C/c = c\n
-  > B2  |  # B2/b = b2\n
-  > |   B  # B/b = b\n
+  >     C  # C/C = C\n
+  > B2  |  # B2/B = B2\n
+  > |   B  # B/B = B\n
   >  \ /   # replace: B -> B2
   >   A
   > EOS
@@ -64,67 +64,67 @@
   move:[3] C
   atop:[2] B2
   move:[4] D
-  merging b
+  merging B
   hit merge conflicts; retrying merge in working copy
-  merging b
-  warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
+  merging B
+  warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
   [240]
   $ hg glog
-  @  6:52da76e91abb draft tip
+  @  6:a2a0434af50b draft tip
   |  C
-  | *  5:eae7899dd92b draft E
+  | *  5:844900596917 draft E
   | |  E
-  | %  4:57e51f6a6d36 draft D
+  | %  4:a75d38413966 draft D
   | |  D
-  | x  3:bc77848cde3a draft C
+  | x  3:46f17045c5ee draft C
   | |  C
-  o |  2:377a194b9b8a draft B2
+  o |  2:3d6c495db414 draft B2
   | |  B2
-  | x  1:830b6315076c draft B
+  | x  1:caf23a7900cb draft B
   |/   B
   o  0:426bada5c675 draft A
      A
-  $ cat c
-  c
-  $ cat b
-  <<<<<<< destination: 52da76e91abb - test: C
-  b2
+  $ cat C
+  C
+  $ cat B
+  <<<<<<< destination: a2a0434af50b - test: C
+  B2
   =======
-  d
-  >>>>>>> evolving:    57e51f6a6d36 D - test: D
-  $ echo d2 > b
+  D
+  >>>>>>> evolving:    a75d38413966 D - test: D
+  $ echo D2 > B
   $ hg resolve -m
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  evolving 4:57e51f6a6d36 "D"
+  evolving 4:a75d38413966 "D"
   move:[5] E
   atop:[7] D
   $ hg glog
-  o  8:3c658574f8ed draft tip
+  o  8:166afca01be8 draft tip
   |  E
-  o  7:16e609b952e8 draft
+  o  7:4f84a36487e4 draft
   |  D
-  o  6:52da76e91abb draft
+  o  6:a2a0434af50b draft
   |  C
-  | x  5:eae7899dd92b draft E
+  | x  5:844900596917 draft E
   | |  E
-  | x  4:57e51f6a6d36 draft D
+  | x  4:a75d38413966 draft D
   | |  D
-  | x  3:bc77848cde3a draft C
+  | x  3:46f17045c5ee draft C
   | |  C
-  o |  2:377a194b9b8a draft B2
+  o |  2:3d6c495db414 draft B2
   | |  B2
-  | x  1:830b6315076c draft B
+  | x  1:caf23a7900cb draft B
   |/   B
   o  0:426bada5c675 draft A
      A
-  $ hg cat -r tip b c e
-  d2
-  c
-  e
+  $ hg cat -r tip B C E
+  D2
+  C
+  E
   $ cd ..
 
 Test that in-memory merge is disabled if there's a precommit hook
@@ -132,9 +132,9 @@
   $ hg init precommit-hook
   $ cd precommit-hook
   $ hg debugdrawdag <<'EOS'
-  >     C  # C/c = c\n
-  > B2  |  # B2/b = b2\n
-  > |   B  # B/b = b\n
+  >     C  # C/C = C\n
+  > B2  |  # B2/B = B2\n
+  > |   B  # B/B = B\n
   >  \ /   # replace: B -> B2
   >   A
   > EOS
@@ -149,20 +149,20 @@
   $ hg evolve --config experimental.evolution.in-memory=force --update
   move:[3] C
   atop:[2] B2
-  working directory is now at 52da76e91abb
+  working directory is now at a2a0434af50b
   $ hg glog
-  @  4:52da76e91abb draft tip
+  @  4:a2a0434af50b draft tip
   |  C
-  | x  3:bc77848cde3a draft C
+  | x  3:46f17045c5ee draft C
   | |  C
-  o |  2:377a194b9b8a draft B2
+  o |  2:3d6c495db414 draft B2
   | |  B2
-  | x  1:830b6315076c draft B
+  | x  1:caf23a7900cb draft B
   |/   B
   o  0:426bada5c675 draft A
      A
   $ hg co tip^
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg amend -m B3
   1 new orphan changesets
 The hook is run with in-memory=yes
@@ -170,17 +170,17 @@
   move:[4] C
   atop:[5] B3
   running precommit hook
-  working directory is now at aeee7323c054
+  working directory is now at 24f38f1ca271
   $ hg glog
-  @  6:aeee7323c054 draft tip
+  @  6:24f38f1ca271 draft tip
   |  C
-  o  5:908ce5f9d7eb draft
+  o  5:b43c30321752 draft
   |  B3
-  | x  3:bc77848cde3a draft C
+  | x  3:46f17045c5ee draft C
   | |  C
-  +---x  2:377a194b9b8a draft B2
+  +---x  2:3d6c495db414 draft B2
   | |    B2
-  | x  1:830b6315076c draft B
+  | x  1:caf23a7900cb draft B
   |/   B
   o  0:426bada5c675 draft A
      A