[PATCH 02 of 14] tests: roll test-commit-unresolved.t into test-resolve.t

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1339161065 -7200
# Node ID b072a32be0f8eb4f7af765c8e61c139ebb2e887a
# Parent  d62774e5fdbcf4dd9a170c2ee2efb4dbbc4d7ffc
tests: roll test-commit-unresolved.t into test-resolve.t

diff --git a/tests/test-commit-unresolved.t b/tests/test-commit-unresolved.t
deleted file mode 100644
--- a/tests/test-commit-unresolved.t
+++ /dev/null
@@ -1,47 +0,0 @@
-  $ echo "[extensions]" >> $HGRCPATH
-  $ echo "graphlog=" >> $HGRCPATH
-
-  $ addcommit () {
-  >     echo $1 > $1
-  >     hg add $1
-  >     hg commit -d "${2} 0" -m $1
-  > }
-
-  $ commit () {
-  >     hg commit -d "${2} 0" -m $1
-  > }
-
-  $ hg init a
-  $ cd a
-  $ addcommit "A" 0
-  $ addcommit "B" 1
-  $ echo "C" >> A
-  $ commit "C" 2
-
-  $ hg update -C 0
-  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ echo "D" >> A
-  $ commit "D" 3
-  created new head
-
-Merging a conflict araises
-
-  $ hg merge
-  merging A
-  warning: conflicts during merge.
-  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
-  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
-  [1]
-
-Correct the conflict without marking the file as resolved
-
-  $ echo "ABCD" > A
-  $ hg commit -m "Merged"
-  abort: unresolved merge conflicts (see hg help resolve)
-  [255]
-
-Mark the conflict as resolved and commit
-
-  $ hg resolve -m A
-  $ hg commit -m "Merged"
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -1,7 +1,7 @@
 test that a commit clears the merge state.
 
-  $ hg init repo
-  $ cd repo
+  $ hg init repo1
+  $ cd repo1
 
   $ echo foo > file
   $ hg commit -Am 'add file'
@@ -42,3 +42,57 @@
 resolve -l, should be empty
 
   $ hg resolve -l
+
+  $ cd ..
+  $ pwd
+  $TESTTMP
+
+
+test commit unresolved
+
+  $ addcommit () {
+  >     echo $1 > $1
+  >     hg add $1
+  >     hg commit -d "${2} 0" -m $1
+  > }
+
+  $ commit () {
+  >     hg commit -d "${2} 0" -m $1
+  > }
+
+  $ hg init repo2
+  $ cd repo2
+  $ addcommit "A" 0
+  $ addcommit "B" 1
+  $ echo "C" >> A
+  $ commit "C" 2
+
+  $ hg update -C 0
+  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo "D" >> A
+  $ commit "D" 3
+  created new head
+
+Merging a conflict araises
+
+  $ hg merge
+  merging A
+  warning: conflicts during merge.
+  merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
+  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  [1]
+
+Correct the conflict without marking the file as resolved
+
+  $ echo "ABCD" > A
+  $ hg commit -m "Merged"
+  abort: unresolved merge conflicts (see hg help resolve)
+  [255]
+
+Mark the conflict as resolved and commit
+
+  $ hg resolve -m A
+  $ hg commit -m "Merged"
+  $ cd ..
+