Mercurial > hg-stable

changeset 24807:fff8b779e63a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-add.t: fix output difference between Windows and OS X (issue4603)
author Matt Harbison <matt_harbison@yahoo.com>
date Fri, 17 Apr 2015 12:11:14 -0400
parents 61aea11fb83d
children d05ede9d3ecc
files tests/test-add.t
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-add.t	Fri Apr 17 23:22:58 2015 +0900
+++ b/tests/test-add.t	Fri Apr 17 12:11:14 2015 -0400
@@ -206,8 +206,10 @@
   $ 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 @@