--- a/tests/test-empty-file Thu Sep 02 17:32:22 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-hg init a
-cd a
-touch empty1
-hg add empty1
-hg commit -m 'add empty1'
-
-touch empty2
-hg add empty2
-hg commit -m 'add empty2'
-
-hg up -C 0
-touch empty3
-hg add empty3
-hg commit -m 'add empty3'
-
-hg heads
-
-hg merge 1
-# before changeset 05257fd28591, we didn't notice the
-# empty file that came from rev 1.
-hg status
-hg commit -m merge
-hg manifest --debug tip
--- a/tests/test-empty-file.out Thu Sep 02 17:32:22 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-created new head
-changeset: 2:a1cb177e0d44
-tag: tip
-parent: 0:1e1d9c4e5b64
-user: test
-date: Thu Jan 01 00:00:00 1970 +0000
-summary: add empty3
-
-changeset: 1:097d2b0e17f6
-user: test
-date: Thu Jan 01 00:00:00 1970 +0000
-summary: add empty2
-
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-M empty2
-b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
-b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
-b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-empty-file.t Thu Sep 02 18:12:07 2010 +0200
@@ -0,0 +1,46 @@
+ $ hg init a
+ $ cd a
+ $ touch empty1
+ $ hg add empty1
+ $ hg commit -m 'add empty1'
+
+ $ touch empty2
+ $ hg add empty2
+ $ hg commit -m 'add empty2'
+
+ $ hg up -C 0
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ touch empty3
+ $ hg add empty3
+ $ hg commit -m 'add empty3'
+ created new head
+
+ $ hg heads
+ changeset: 2:a1cb177e0d44
+ tag: tip
+ parent: 0:1e1d9c4e5b64
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add empty3
+
+ changeset: 1:097d2b0e17f6
+ user: test
+ date: Thu Jan 01 00:00:00 1970 +0000
+ summary: add empty2
+
+
+ $ hg merge 1
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+
+Before changeset 05257fd28591, we didn't notice the
+empty file that came from rev 1:
+
+ $ hg status
+ M empty2
+ $ hg commit -m merge
+ $ hg manifest --debug tip
+ b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
+ b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
+ b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3
+