changeset 19104:370d9ea027b1 stable

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.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 30 Apr 2013 05:01:32 +0900
parents 0176d0db4671
children c60a7f5a741f
files tests/test-casecollision-merge.t
diffstat 1 files changed, 9 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-casecollision-merge.t	Tue Apr 30 05:00:48 2013 +0900
+++ b/tests/test-casecollision-merge.t	Tue Apr 30 05:01:32 2013 +0900
@@ -20,34 +20,23 @@
   $ 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
 
-  $ 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
-    a
   R a
-  $ cat A
-  modified at #2
+  C x
 
-  $ 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
-  M A
-    a
-  $ cat A
-  modified at #2
+  M x
+  C A
 
   $ cd ..