# HG changeset patch # User Danek Duvall # Date 1464372869 25200 # Node ID b0b85d8695cbd5fd6d134395afcb0caccb5fb20d # Parent c5912a0b156c1e42159504c6deff6283095ca298 test-cache-abuse: correct for different hunk headers between Solaris and GNU When diffing against an empty file, Solaris diff uses 1 to designate the first line of the empty file (either -1,0 on the left or +1,0 on the right) while GNU diff uses 0 (-0,0 and +0,0). We use a glob here to make sure the test passes with either toolchain. I've not added tests to check-code because there are scads of places in the tests where the GNU format is used due to that being the format that "hg diff" and "hg export" use, and changing those to use globs seems wrong. diff -r c5912a0b156c -r b0b85d8695cb tests/test-cache-abuse.t --- a/tests/test-cache-abuse.t Fri May 27 21:24:05 2016 +0200 +++ b/tests/test-cache-abuse.t Fri May 27 11:14:29 2016 -0700 @@ -88,7 +88,7 @@ $ damage "log -qr branch(b2)" rbc-names-v1 --- before * (glob) +++ after * (glob) - @@ -1,8 +0,0 @@ + @@ -1,8 +?,0 @@ (glob) -2:5fb7d38b9dc4 -3:60b597ffdafa -4:b1174d11b69e