changeset 12299:a73684df0f8a

tests: unify test-update-renames
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 14 Sep 2010 15:37:10 +0200
parents f254204d8b8d
children ca31b0b2ac16
files tests/test-update-renames tests/test-update-renames.out tests/test-update-renames.t
diffstat 3 files changed, 29 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-update-renames	Tue Sep 14 13:43:05 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# test update logic when there are renames
-
-
-# update with local changes across a file rename
-hg init a
-cd a
-echo a > a
-hg add a
-hg ci -m a
-hg mv a b
-hg ci -m rename
-echo b > b
-hg ci -m change
-hg up -q 0
-echo c > a
-hg up
-cd ..
--- a/tests/test-update-renames.out	Tue Sep 14 13:43:05 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-merging a and b to b
-warning: conflicts during merge.
-merging b failed!
-0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-update-renames.t	Tue Sep 14 15:37:10 2010 +0200
@@ -0,0 +1,29 @@
+# test update logic when there are renames
+
+# update with local changes across a file rename
+
+  $ hg init
+
+  $ echo a > a
+  $ hg add a
+  $ hg ci -m a
+
+  $ hg mv a b
+  $ hg ci -m rename
+
+  $ echo b > b
+  $ hg ci -m change
+
+  $ hg up -q 0
+
+  $ echo c > a
+
+  $ hg up
+  merging a and b to b
+  warning: conflicts during merge.
+  merging b failed!
+  0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+  use 'hg resolve' to retry unresolved file merges
+
+  $ cd ..
+