Mercurial > hg
changeset 11921:650d8a023249
tests: unify test-diffdir
| author | Pradeepkumar Gayam <in3xes@gmail.com> |
|---|---|
| date | Tue, 17 Aug 2010 17:57:48 +0530 |
| parents | d0a7e700b5d1 |
| children | 3e59059b2785 |
| files | tests/test-diffdir tests/test-diffdir.out tests/test-diffdir.t |
| diffstat | 3 files changed, 40 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-diffdir Tue Aug 17 17:56:26 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh - -hg init -touch a -hg add a -hg ci -m "a" -d "1000000 0" - -echo 123 > b -hg add b -hg diff --nodates - -hg diff --nodates -r tip - -echo foo > a -hg diff --nodates - -hg diff -r "" -hg diff -r tip -r "" - -true
--- a/tests/test-diffdir.out Tue Aug 17 17:56:26 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -diff -r acd8075edac9 b ---- /dev/null -+++ b/b -@@ -0,0 +1,1 @@ -+123 -diff -r acd8075edac9 b ---- /dev/null -+++ b/b -@@ -0,0 +1,1 @@ -+123 -diff -r acd8075edac9 a ---- a/a -+++ b/a -@@ -0,0 +1,1 @@ -+foo -diff -r acd8075edac9 b ---- /dev/null -+++ b/b -@@ -0,0 +1,1 @@ -+123 -abort: 00changelog.i@: ambiguous identifier! -abort: 00changelog.i@: ambiguous identifier!
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-diffdir.t Tue Aug 17 17:57:48 2010 +0530 @@ -0,0 +1,40 @@ + $ hg init + $ touch a + $ hg add a + $ hg ci -m "a" -d "1000000 0" + + $ echo 123 > b + $ hg add b + $ hg diff --nodates + diff -r acd8075edac9 b + --- /dev/null + +++ b/b + @@ -0,0 +1,1 @@ + +123 + + $ hg diff --nodates -r tip + diff -r acd8075edac9 b + --- /dev/null + +++ b/b + @@ -0,0 +1,1 @@ + +123 + + $ echo foo > a + $ hg diff --nodates + diff -r acd8075edac9 a + --- a/a + +++ b/a + @@ -0,0 +1,1 @@ + +foo + diff -r acd8075edac9 b + --- /dev/null + +++ b/b + @@ -0,0 +1,1 @@ + +123 + + $ hg diff -r "" + abort: 00changelog.i@: ambiguous identifier! + $ hg diff -r tip -r "" + abort: 00changelog.i@: ambiguous identifier! + + $ true