Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-merge2
authorPradeepkumar Gayam <in3xes@gmail.com>
Wed, 18 Aug 2010 05:09:58 +0530
changeset 11976 b28fc3b3efd6
parent 11975 21884b433c51
child 11977 db2a291e25e9
tests: unify test-merge2
tests/test-merge2 file | annotate | diff | comparison | revisions
tests/test-merge2.out file | annotate | diff | comparison | revisions
tests/test-merge2.t file | annotate | diff | comparison | revisions 
--- a/tests/test-merge2	Wed Aug 18 05:05:51 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-mkdir t
-cd t
-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"
-rm b
-hg update 0
-echo This is file b2 > b
-hg add b
-hg commit -m "commit #2" -d "1000000 0"
-cd ..; rm -r t
-
-mkdir t
-cd t
-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"
-rm b
-hg update 0
-echo This is file b2 > b
-hg commit -A -m "commit #2" -d "1000000 0"
-cd ..; rm -r t
-
-mkdir t
-cd t
-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"
-rm b
-hg remove b
-hg update 0
-echo This is file b2 > b
-hg commit -A -m "commit #2" -d "1000000 0"
--- a/tests/test-merge2.out	Wed Aug 18 05:05:51 2010 +0530
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-created new head
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-adding b
-created new head
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-adding b
-created new head
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-merge2.t	Wed Aug 18 05:09:58 2010 +0530
@@ -0,0 +1,53 @@
+  $ mkdir t
+  $ cd t
+  $ 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"
+  $ rm b
+  $ hg update 0
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo This is file b2 > b
+  $ hg add b
+  $ hg commit -m "commit #2" -d "1000000 0"
+  created new head
+  $ cd ..; rm -r t
+
+  $ mkdir t
+  $ cd t
+  $ 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"
+  $ rm b
+  $ hg update 0
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo This is file b2 > b
+  $ hg commit -A -m "commit #2" -d "1000000 0"
+  adding b
+  created new head
+  $ cd ..; rm -r t
+
+  $ mkdir t
+  $ cd t
+  $ 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"
+  $ rm b
+  $ hg remove b
+  $ hg update 0
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ echo This is file b2 > b
+  $ hg commit -A -m "commit #2" -d "1000000 0"
+  adding b
+  created new head
mercurial