[PATCH] tests: unify test-diff-subdir
Adrian Buehlmann
adrian at cadifra.com
Tue Aug 31 04:20:19 CDT 2010
# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1283246088 -7200
# Node ID 0e60091707c32e8a8ae827c74a088d356e6507ce
# Parent 0179188626428c84e2469707b31ace9f04d90e60
tests: unify test-diff-subdir
diff --git a/tests/test-diff-subdir.out b/tests/test-diff-subdir.out
deleted file mode 100644
--- a/tests/test-diff-subdir.out
+++ /dev/null
@@ -1,23 +0,0 @@
-EVERYTHING
-diff -r ec612a6291f1 alpha/one
---- a/alpha/one
-+++ b/alpha/one
-@@ -0,0 +1,1 @@
-+1
-diff -r ec612a6291f1 beta/two
---- a/beta/two
-+++ b/beta/two
-@@ -0,0 +1,1 @@
-+2
-BETA ONLY
-diff -r ec612a6291f1 beta/two
---- a/beta/two
-+++ b/beta/two
-@@ -0,0 +1,1 @@
-+2
-INSIDE BETA
-diff -r ec612a6291f1 beta/two
---- a/beta/two
-+++ b/beta/two
-@@ -0,0 +1,1 @@
-+2
diff --git a/tests/test-diff-subdir b/tests/test-diff-subdir.t
old mode 100755
new mode 100644
rename from tests/test-diff-subdir
rename to tests/test-diff-subdir.t
--- a/tests/test-diff-subdir
+++ b/tests/test-diff-subdir.t
@@ -1,24 +1,46 @@
-#!/bin/sh
+ $ hg init
-hg init
+ $ mkdir alpha
+ $ touch alpha/one
+ $ mkdir beta
+ $ touch beta/two
-mkdir alpha
-touch alpha/one
-mkdir beta
-touch beta/two
+ $ hg add alpha/one beta/two
+ $ hg ci -m "start"
-hg add alpha/one beta/two
-hg ci -m "start" -d "1000000 0"
+ $ echo 1 > alpha/one
+ $ echo 2 > beta/two
-echo 1 > alpha/one
-echo 2 > beta/two
+everything
-echo EVERYTHING
-hg diff --nodates
+ $ hg diff --nodates
+ diff -r 7d5ef1aea329 alpha/one
+ --- a/alpha/one
+ +++ b/alpha/one
+ @@ -0,0 +1,1 @@
+ +1
+ diff -r 7d5ef1aea329 beta/two
+ --- a/beta/two
+ +++ b/beta/two
+ @@ -0,0 +1,1 @@
+ +2
-echo BETA ONLY
-hg diff --nodates beta
+beta only
-echo INSIDE BETA
-cd beta
-hg diff --nodates .
+ $ hg diff --nodates beta
+ diff -r 7d5ef1aea329 beta/two
+ --- a/beta/two
+ +++ b/beta/two
+ @@ -0,0 +1,1 @@
+ +2
+
+inside beta
+
+ $ cd beta
+ $ hg diff --nodates .
+ diff -r 7d5ef1aea329 beta/two
+ --- a/beta/two
+ +++ b/beta/two
+ @@ -0,0 +1,1 @@
+ +2
+
More information about the Mercurial-devel
mailing list