[PATCH 05 of 14] tests: roll test-copy-move-merge.t into test-copy.t

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1339161065 -7200
# Node ID 2615f532eaeb7622bf50e0945daa48fb5e3f8547
# Parent  69385ce00807365e90f00506272f3864e3847a8a
tests: roll test-copy-move-merge.t into test-copy.t

diff --git a/tests/test-copy-move-merge.t b/tests/test-copy-move-merge.t
deleted file mode 100644
--- a/tests/test-copy-move-merge.t
+++ /dev/null
@@ -1,62 +0,0 @@
-  $ hg init t
-  $ cd t
-
-  $ echo 1 > a
-  $ hg ci -qAm "first"
-
-  $ hg cp a b
-  $ hg mv a c
-  $ echo 2 >> b
-  $ echo 2 >> c
-
-  $ hg ci -qAm "second"
-
-  $ hg co -C 0
-  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
-
-  $ echo 0 > a
-  $ echo 1 >> a
-
-  $ hg ci -qAm "other"
-
-  $ hg merge --debug
-    searching for copies back to rev 1
-    unmatched files in other:
-     b
-     c
-    all copies found (* = to merge, ! = divergent, % = renamed and deleted):
-     c -> a *
-     b -> a *
-    checking for directory renames
-  resolving manifests
-   overwrite: False, partial: False
-   ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
-   a: remote moved to c -> m
-   a: remote moved to b -> m
-  preserving a for resolve of b
-  preserving a for resolve of c
-  removing a
-  updating: a 1/2 files (50.00%)
-  picked tool 'internal:merge' for b (binary False symlink False)
-  merging a and b to b
-  my b at add3f11052fa+ other b at 17c05bb7fcb6 ancestor a at b8bf91eeebbc
-   premerge successful
-  updating: a 2/2 files (100.00%)
-  picked tool 'internal:merge' for c (binary False symlink False)
-  merging a and c to c
-  my c at add3f11052fa+ other c at 17c05bb7fcb6 ancestor a at b8bf91eeebbc
-   premerge successful
-  0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
-
-file b
-  $ cat b
-  0
-  1
-  2
-
-file c
-  $ cat c
-  0
-  1
-  2
diff --git a/tests/test-copy.t b/tests/test-copy.t
--- a/tests/test-copy.t
+++ b/tests/test-copy.t
@@ -212,3 +212,76 @@
   $ hg st -AC foo
   M foo
     bar
+
+  $ cd ..
+  $ pwd
+  $TESTTMP
+
+
+  $ mkdir part3
+  $ cd part3
+
+test copy move merge
+
+  $ hg init t
+  $ cd t
+
+  $ echo 1 > a
+  $ hg ci -qAm "first"
+
+  $ hg cp a b
+  $ hg mv a c
+  $ echo 2 >> b
+  $ echo 2 >> c
+
+  $ hg ci -qAm "second"
+
+  $ hg co -C 0
+  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
+
+  $ echo 0 > a
+  $ echo 1 >> a
+
+  $ hg ci -qAm "other"
+
+  $ hg merge --debug
+    searching for copies back to rev 1
+    unmatched files in other:
+     b
+     c
+    all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     c -> a *
+     b -> a *
+    checking for directory renames
+  resolving manifests
+   overwrite: False, partial: False
+   ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
+   a: remote moved to c -> m
+   a: remote moved to b -> m
+  preserving a for resolve of b
+  preserving a for resolve of c
+  removing a
+  updating: a 1/2 files (50.00%)
+  picked tool 'internal:merge' for b (binary False symlink False)
+  merging a and b to b
+  my b at add3f11052fa+ other b at 17c05bb7fcb6 ancestor a at b8bf91eeebbc
+   premerge successful
+  updating: a 2/2 files (100.00%)
+  picked tool 'internal:merge' for c (binary False symlink False)
+  merging a and c to c
+  my c at add3f11052fa+ other c at 17c05bb7fcb6 ancestor a at b8bf91eeebbc
+   premerge successful
+  0 files updated, 2 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+
+file b
+  $ cat b
+  0
+  1
+  2
+
+file c
+  $ cat c
+  0
+  1
+  2