Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-diff-subdir
authorAdrian Buehlmann <adrian@cadifra.com>
Tue, 31 Aug 2010 11:14:48 +0200
changeset 12140 552ea44c1842
parent 12139 5a69ea8d65b3
child 12141 5f44daa8fbd0
tests: unify test-diff-subdir
tests/test-diff-change.t file | annotate | diff | comparison | revisions
tests/test-diff-hashes.t file | annotate | diff | comparison | revisions
tests/test-diff-ignore-whitespace.t file | annotate | diff | comparison | revisions
tests/test-diff-reverse.t file | annotate | diff | comparison | revisions
tests/test-diff-subdir file | annotate | diff | comparison | revisions
tests/test-diff-subdir.out file | annotate | diff | comparison | revisions
tests/test-diff-subdir.t file | annotate | diff | comparison | revisions 
--- a/tests/test-diff-subdir	Tue Aug 31 10:21:24 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-hg init
-
-mkdir alpha
-touch alpha/one
-mkdir beta
-touch beta/two
-
-hg add alpha/one beta/two
-hg ci -m "start" -d "1000000 0"
-
-echo 1 > alpha/one
-echo 2 > beta/two
-
-echo EVERYTHING
-hg diff --nodates
-
-echo BETA ONLY
-hg diff --nodates beta
-
-echo INSIDE BETA
-cd beta
-hg diff --nodates .
--- a/tests/test-diff-subdir.out	Tue Aug 31 10:21:24 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -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
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-diff-subdir.t	Tue Aug 31 11:14:48 2010 +0200
@@ -0,0 +1,46 @@
+  $ hg init
+
+  $ mkdir alpha
+  $ touch alpha/one
+  $ mkdir beta
+  $ touch beta/two
+
+  $ hg add alpha/one beta/two
+  $ hg ci -m "start"
+
+  $ echo 1 > alpha/one
+  $ echo 2 > beta/two
+
+everything
+
+  $ 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
+
+beta only
+
+  $ 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
+
Mercurial