# HG changeset patch
# User Pradeepkumar Gayam <in3xes@gmail.com>
# Date 1282088749 -19800
# Node ID ef4a1ffbf519cb44f650b765900c23b81f038a45
# Parent  db2a291e25e9d607d80a59819b3e962f183f01c7
tests: unify test-merge5

diff -r db2a291e25e9 -r ef4a1ffbf519 tests/test-merge5
--- a/tests/test-merge5	Wed Aug 18 05:12:44 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-mkdir t
-cd t
-hg init
-echo This is file a1 > a
-echo This is file b1 > b
-hg add a b
-hg commit -m "commit #0" -d "1000000 0"
-echo This is file b22 > b
-hg commit -m"comment #1" -d "1000000 0"
-hg update 0
-rm b
-hg commit -A -m"comment #2" -d "1000000 0"
-mv a c
-# in theory, we shouldn't need the "-y" below, but it prevents
-# this test from hanging when "hg update" erroneously prompts the
-# user for "keep or delete"
-echo % should abort
-hg update -y 1
-mv c a
-echo % should succeed
-hg update -y 1
-
-exit 0
diff -r db2a291e25e9 -r ef4a1ffbf519 tests/test-merge5.out
--- a/tests/test-merge5.out	Wed Aug 18 05:12:44 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-removing b
-created new head
-% should abort
-abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
-% should succeed
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r db2a291e25e9 -r ef4a1ffbf519 tests/test-merge5.t
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge5.t	Wed Aug 18 05:15:49 2010 +0530
@@ -0,0 +1,29 @@
+  $ mkdir t
+  $ cd t
+  $ hg init
+  $ echo This is file a1 > a
+  $ echo This is file b1 > b
+  $ hg add a b
+  $ hg commit -m "commit #0" -d "1000000 0"
+  $ echo This is file b22 > b
+  $ hg commit -m"comment #1" -d "1000000 0"
+  $ hg update 0
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ rm b
+  $ hg commit -A -m"comment #2" -d "1000000 0"
+  removing b
+  created new head
+  $ mv a c
+in theory, we shouldn't need the "-y" below, but it prevents
+this test from hanging when "hg update" erroneously prompts the
+user for "keep or delete"
+
+should abort
+  $ hg update -y 1
+  abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
+  $ mv c a
+should succeed
+  $ hg update -y 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+
+  $ exit 0