[PATCH 2 of 4 STABLE] icasefs: refactor "test-casecollision-merge.t" to reuse in succeeding fixes
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Mon Apr 29 16:01:50 CDT 2013
# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1367265692 -32400
# Tue Apr 30 05:01:32 2013 +0900
# Branch stable
# Node ID edfcf328efbf13e1f01260ab1e8ee2d3fbdc87a4
# Parent db31701b54f7bffd6cb8a0e5cc6008a6848aac2a
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.
diff --git a/tests/test-casecollision-merge.t b/tests/test-casecollision-merge.t
--- a/tests/test-casecollision-merge.t
+++ b/tests/test-casecollision-merge.t
@@ -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 ..
More information about the Mercurial-devel
mailing list