##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

commit: when committing the results of a merge, it's all or nothing...
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.
Matt Mackall - - Load All Authors

File last commit:

r5863:3d1f9dce default
r6385:0d4e068e default
Show More
test-diff-ignore-whitespace.out
289 lines | 4.1 KiB | text/plain | TextLexer
/ tests / test-diff-ignore-whitespace.out
History | Source | Raw |Copy content |Copy permalink
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 adding foo
>>> two diffs showing three added lines <<<
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,5 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 +
hello world
+
goodbye world
+
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -b
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,5 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 +
hello world
+
goodbye world
+
>>> no diffs <<<
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -B
hg diff -Bb
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 >>> four diffs showing added space first on the first line <<<
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 -hello world
+ hello world
goodbye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -b
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 -hello world
+ hello world
goodbye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -B
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 -hello world
+ hello world
goodbye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -Bb
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 -hello world
+ hello world
goodbye world
>>> two diffs showing space appended to the first line <<<
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 -hello world
+hello world
goodbye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -B
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 -hello world
+hello world
goodbye world
>>> no diffs <<<
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -b
hg diff -Bb
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 >>> four diffs showing space inserted into "goodbye" <<<
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 hello world
-goodbye world
+good bye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -B
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 hello world
-goodbye world
+good bye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -b
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 hello world
-goodbye world
+good bye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -Bb
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 hello world
-goodbye world
+good bye world
>>> two diffs showing changed whitespace amount in the last line <<<
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 hello world
-goodbye world
+goodbye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -B
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 hello world
-goodbye world
+goodbye world
>>> no diffs <<<
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -b
hg diff -Bb
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 >>> four diffs showing added blank line w/horizontal space <<<
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,3 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 hello world
+
goodbye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -B
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,3 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hello world
+
goodbye world
hg diff -b
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,3 @@
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 hello world
+
goodbye world
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 hg diff -Bb
>>> three diffs showing added blank line w/other space <<<
hg diff
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,3 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+hello world
+
+goodbye world
hg diff -B
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,3 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+hello world
+
+goodbye world
hg diff -b
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,3 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+hello world
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 +
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 +goodbye world
hg diff -Bb
>>> four diffs showing changed whitespace <<<
hg diff
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+helloworld
+goodbye world
hg diff -B
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+helloworld
+goodbye world
hg diff -b
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+helloworld
+goodbye world
hg diff -Bb
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,2 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+helloworld
+goodbye world
hg diff -w
>>> five diffs showing changed whitespace <<<
hg diff
Vadim Gelfer
add missed tests for diff -b/-B
 r2594 diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,5 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+helloworld
+
+
+
+goodbye world
hg diff -B
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,5 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+helloworld
+
+
+
+goodbye world
hg diff -b
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,5 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+helloworld
+
+
+
+goodbye world
hg diff -Bb
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,5 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+helloworld
+
+
+
+goodbye world
hg diff -w
diff -r 540c40a65b78 foo
--- a/foo
+++ b/foo
Matt Mackall
diff: don't show function name by default...
 r5863 @@ -1,2 +1,5 @@
Matt Mackall
diff: correctly handle combinations of whitespace options
 r4878 -hello world
-goodbye world
+helloworld
+
+
+
+goodbye world
hg diff -wB