# HG changeset patch # User Adrian Buehlmann # Date 2010-09-02 15:32:22 # Node ID 019cd2826d211f76575dd8ec14100eb791248777 # Parent 88250a460bf864c27a045f9cbab0796ce9cf0800 tests: unify test-empty-dir diff --git a/tests/test-empty-dir.out b/tests/test-empty-dir.out deleted file mode 100644 --- a/tests/test-empty-dir.out +++ /dev/null @@ -1,4 +0,0 @@ -321 -0 files updated, 0 files merged, 1 files removed, 0 files unresolved -sub/b not present -sub not present diff --git a/tests/test-empty-dir b/tests/test-empty-dir.t old mode 100755 new mode 100644 rename from tests/test-empty-dir rename to tests/test-empty-dir.t --- a/tests/test-empty-dir +++ b/tests/test-empty-dir.t @@ -1,16 +1,25 @@ -#!/bin/sh + $ hg init + + $ echo 123 > a + $ hg add a + $ hg commit -m "first" a + + $ mkdir sub + $ echo 321 > sub/b + $ hg add sub/b + $ hg commit -m "second" sub/b -hg init -echo 123 > a -hg add a -hg commit -m "first" a -mkdir sub -echo 321 > sub/b -hg add sub/b -hg commit -m "second" sub/b -cat sub/b -hg co 0 -cat sub/b 2>/dev/null || echo "sub/b not present" -test -d sub || echo "sub not present" + $ cat sub/b + 321 + + $ hg co 0 + 0 files updated, 0 files merged, 1 files removed, 0 files unresolved -true + $ cat sub/b 2>/dev/null || echo "sub/b not present" + sub/b not present + + $ test -d sub || echo "sub not present" + sub not present + + $ true +