Show More
@@ -178,6 +178,8 b' utestpats = [' | |||
|
178 | 178 | 'use test -f to test for file existence'), |
|
179 | 179 | (r'^ diff -[^ -]*p', |
|
180 | 180 | "don't use (external) diff with -p for portability"), |
|
181 | (r'^ [-+][-+][-+] .* [-+]0000 \(glob\)', | |
|
182 | "glob timezone field in diff output for portability"), | |
|
181 | 183 | ], |
|
182 | 184 | # warnings |
|
183 | 185 | [ |
@@ -226,7 +226,7 b' and OS X' | |||
|
226 | 226 | $ hg diff capsdir1/capsdir |
|
227 | 227 | diff -r * CapsDir1/CapsDir/SubDir/Def.txt (glob) |
|
228 | 228 | --- a/CapsDir1/CapsDir/SubDir/Def.txt Thu Jan 01 00:00:00 1970 +0000 |
|
229 |
+++ b/CapsDir1/CapsDir/SubDir/Def.txt * |
|
|
229 | +++ b/CapsDir1/CapsDir/SubDir/Def.txt * (glob) | |
|
230 | 230 | @@ -1,1 +1,1 @@ |
|
231 | 231 | -xyz |
|
232 | 232 | +def |
@@ -349,8 +349,8 b' Disallow grafting an already grafted cse' | |||
|
349 | 349 | [255] |
|
350 | 350 | |
|
351 | 351 | $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 |
|
352 |
--- */hg-5c095ad7e90f.patch * |
|
|
353 |
+++ */hg-7a4785234d87.patch * |
|
|
352 | --- */hg-5c095ad7e90f.patch * (glob) | |
|
353 | +++ */hg-7a4785234d87.patch * (glob) | |
|
354 | 354 | @@ -1,18 +1,18 @@ |
|
355 | 355 | # HG changeset patch |
|
356 | 356 | -# User test |
@@ -380,8 +380,8 b' Disallow grafting an already grafted cse' | |||
|
380 | 380 | [1] |
|
381 | 381 | |
|
382 | 382 | $ hg extdiff --config extensions.extdiff= --patch -r 2 -r 13 -X . |
|
383 |
--- */hg-5c095ad7e90f.patch * |
|
|
384 |
+++ */hg-7a4785234d87.patch * |
|
|
383 | --- */hg-5c095ad7e90f.patch * (glob) | |
|
384 | +++ */hg-7a4785234d87.patch * (glob) | |
|
385 | 385 | @@ -1,8 +1,8 @@ |
|
386 | 386 | # HG changeset patch |
|
387 | 387 | -# User test |
@@ -721,14 +721,14 b' Interaction with extdiff, largefiles and' | |||
|
721 | 721 | |
|
722 | 722 | $ hg --config extensions.extdiff= extdiff -r '.^' -S |
|
723 | 723 | diff -Nru cloned.*/.hgsub cloned/.hgsub (glob) |
|
724 |
--- cloned.*/.hgsub * |
|
|
725 |
+++ cloned/.hgsub * |
|
|
724 | --- cloned.*/.hgsub * (glob) | |
|
725 | +++ cloned/.hgsub * (glob) | |
|
726 | 726 | @@ -1,2 +1 @@ |
|
727 | 727 | sub1 = ../sub1 |
|
728 | 728 | -sub3 = sub3 |
|
729 | 729 | diff -Nru cloned.*/.hgsubstate cloned/.hgsubstate (glob) |
|
730 |
--- cloned.*/.hgsubstate * |
|
|
731 |
+++ cloned/.hgsubstate * |
|
|
730 | --- cloned.*/.hgsubstate * (glob) | |
|
731 | +++ cloned/.hgsubstate * (glob) | |
|
732 | 732 | @@ -1,2 +1 @@ |
|
733 | 733 | 7a36fa02b66e61f27f3d4a822809f159479b8ab2 sub1 |
|
734 | 734 | -b1a26de6f2a045a9f079323693614ee322f1ff7e sub3 |
General Comments 0
You need to be logged in to leave comments.
Login now