[PATCH STABLE] test-add.t: fix output difference between Windows and OS X (issue4603)
Matt Harbison
mharbison at attotech.com
Fri Apr 17 16:16:32 UTC 2015
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1429287074 14400
# Fri Apr 17 12:11:14 2015 -0400
# Branch stable
# Node ID a9326b297b68e77c60fba69aeaf17b725ac84923
# Parent 82fe5721302973f90b594239772a05f447c493aa
test-add.t: fix output difference between Windows and OS X (issue4603)
diff --git a/tests/test-add.t b/tests/test-add.t
--- a/tests/test-add.t
+++ b/tests/test-add.t
@@ -206,8 +206,10 @@ Test that adding a directory doesn't req
$ hg revert -r '.^' capsdir1/capsdir
reverting CapsDir1/CapsDir/SubDir/Def.txt (glob)
+The conditional tests above mean the hash on the diff line differs on Windows
+and OS X
$ hg diff capsdir1/capsdir
- diff -r 5112e00e781d CapsDir1/CapsDir/SubDir/Def.txt
+ diff -r * CapsDir1/CapsDir/SubDir/Def.txt (glob)
--- a/CapsDir1/CapsDir/SubDir/Def.txt Thu Jan 01 00:00:00 1970 +0000
+++ b/CapsDir1/CapsDir/SubDir/Def.txt * +0000 (glob)
@@ -1,1 +1,1 @@
More information about the Mercurial-devel
mailing list