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