Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-diff-ignore-whitespace.out @ 4879:da8640113b5a
Merge with -stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 14 Jul 2007 13:34:40 -0500 |
parents | 372d93f03d3a |
children |
line wrap: on
line diff
--- a/tests/test-diff-ignore-whitespace.out +++ b/tests/test-diff-ignore-whitespace.out @@ -1,5 +1,6 @@ adding foo >>> two diffs showing three added lines <<< +hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -9,6 +10,7 @@ diff -r 540c40a65b78 foo + goodbye world + +hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -19,7 +21,10 @@ diff -r 540c40a65b78 foo goodbye world + >>> no diffs <<< +hg diff -B +hg diff -Bb >>> four diffs showing added space first on the first line <<< +hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -27,6 +32,7 @@ diff -r 540c40a65b78 foo -hello world + hello world goodbye world +hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -34,6 +40,7 @@ diff -r 540c40a65b78 foo -hello world + hello world goodbye world +hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -41,6 +48,7 @@ diff -r 540c40a65b78 foo -hello world + hello world goodbye world +hg diff -Bb diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -49,6 +57,7 @@ diff -r 540c40a65b78 foo + hello world goodbye world >>> two diffs showing space appended to the first line <<< +hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -56,6 +65,7 @@ diff -r 540c40a65b78 foo -hello world +hello world goodbye world +hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -64,7 +74,10 @@ diff -r 540c40a65b78 foo +hello world goodbye world >>> no diffs <<< +hg diff -b +hg diff -Bb >>> four diffs showing space inserted into "goodbye" <<< +hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -72,6 +85,7 @@ diff -r 540c40a65b78 foo hello world -goodbye world +good bye world +hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -79,6 +93,7 @@ diff -r 540c40a65b78 foo hello world -goodbye world +good bye world +hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -86,6 +101,7 @@ diff -r 540c40a65b78 foo hello world -goodbye world +good bye world +hg diff -Bb diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -94,6 +110,7 @@ diff -r 540c40a65b78 foo -goodbye world +good bye world >>> two diffs showing changed whitespace amount in the last line <<< +hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -101,6 +118,7 @@ diff -r 540c40a65b78 foo hello world -goodbye world +goodbye world +hg diff -B diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -109,7 +127,10 @@ diff -r 540c40a65b78 foo -goodbye world +goodbye world >>> no diffs <<< +hg diff -b +hg diff -Bb >>> four diffs showing added blank line w/horizontal space <<< +hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -117,6 +138,15 @@ diff -r 540c40a65b78 foo hello world + goodbye world +hg diff -B +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,3 @@ hello world + hello world ++ + goodbye world +hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -124,17 +154,136 @@ diff -r 540c40a65b78 foo hello world + goodbye world +hg diff -Bb +>>> three diffs showing added blank line w/other space <<< +hg diff +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,3 @@ hello world +-hello world +-goodbye world ++hello world ++ ++goodbye world +hg diff -B +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,3 @@ hello world +-hello world +-goodbye world ++hello world ++ ++goodbye world +hg diff -b diff -r 540c40a65b78 foo --- a/foo +++ b/foo @@ -1,2 +1,3 @@ hello world - hello world +-hello world +-goodbye world ++hello world + - goodbye world ++goodbye world +hg diff -Bb +>>> four diffs showing changed whitespace <<< +hg diff +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,2 @@ hello world +-hello world +-goodbye world ++helloworld ++goodbye world +hg diff -B +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,2 @@ hello world +-hello world +-goodbye world ++helloworld ++goodbye world +hg diff -b +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,2 @@ hello world +-hello world +-goodbye world ++helloworld ++goodbye world +hg diff -Bb +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,2 @@ hello world +-hello world +-goodbye world ++helloworld ++goodbye world +hg diff -w +>>> five diffs showing changed whitespace <<< +hg diff diff -r 540c40a65b78 foo --- a/foo +++ b/foo -@@ -1,2 +1,3 @@ hello world - hello world -+ - goodbye world +@@ -1,2 +1,5 @@ hello world +-hello world +-goodbye world ++helloworld ++ ++ ++ ++goodbye world +hg diff -B +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,5 @@ hello world +-hello world +-goodbye world ++helloworld ++ ++ ++ ++goodbye world +hg diff -b +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,5 @@ hello world +-hello world +-goodbye world ++helloworld ++ ++ ++ ++goodbye world +hg diff -Bb +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,5 @@ hello world +-hello world +-goodbye world ++helloworld ++ ++ ++ ++goodbye world +hg diff -w +diff -r 540c40a65b78 foo +--- a/foo ++++ b/foo +@@ -1,2 +1,5 @@ hello world +-hello world +-goodbye world ++helloworld ++ ++ ++ ++goodbye world +hg diff -wB