[PATCH 07 of 13] tests: unify test-merge4

in3xes at gmail.com in3xes at gmail.com
Thu Aug 19 03:56:53 CDT 2010


# HG changeset patch
# User Pradeepkumar Gayam <in3xes at gmail.com>
# Date 1282088564 -19800
# Node ID 2bb9742c2acd0238080f59cb19d4f0bdf9f17862
# Parent  26d5e9a9ae8385b70575b813e8d18608a8c53211
tests: unify test-merge4

diff --git a/tests/test-merge4.out b/tests/test-merge4.out
deleted file mode 100644
--- a/tests/test-merge4.out
+++ /dev/null
@@ -1,4 +0,0 @@
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-created new head
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
diff --git a/tests/test-merge4 b/tests/test-merge4.t
old mode 100755
new mode 100644
rename from tests/test-merge4
rename to tests/test-merge4.t
--- a/tests/test-merge4
+++ b/tests/test-merge4.t
@@ -1,17 +1,20 @@
-#!/bin/sh
+  $ hg init
+  $ echo This is file a1 > a
+  $ hg add a
+  $ hg commit -m "commit #0" -d "1000000 0"
+  $ echo This is file b1 > b
+  $ hg add b
+  $ hg commit -m "commit #1" -d "1000000 0"
+  $ hg update 0
+  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  $ echo This is file c1 > c
+  $ hg add c
+  $ hg commit -m "commit #2" -d "1000000 0"
+  created new head
+  $ hg merge 1
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ rm b
+  $ echo This is file c22 > c
+  $ hg commit -m "commit #3" -d "1000000 0"
 
-hg init
-echo This is file a1 > a
-hg add a
-hg commit -m "commit #0" -d "1000000 0"
-echo This is file b1 > b
-hg add b
-hg commit -m "commit #1" -d "1000000 0"
-hg update 0
-echo This is file c1 > c
-hg add c
-hg commit -m "commit #2" -d "1000000 0"
-hg merge 1
-rm b
-echo This is file c22 > c
-hg commit -m "commit #3" -d "1000000 0"


More information about the Mercurial-devel mailing list