Fossil SCM

Partially backout [bf9669f5]. Leave whitespace alone in test files

andygoth 2016-11-07 01:32 trunk
Commit 6a3e2ed87eff4090e8759bf662ec4c5fc2a3f5a3
Parent bf9669f55e5fee9…
5 files changed +1 -1 +2 -2 +1 -1 +1 -1 +1 -1
~ test/diff-test-1.wiki ~ test/merge1.test ~ test/merge3.test ~ test/merge5.test ~ test/revert.test
M test/diff-test-1.wiki
+1 -1
--- test/diff-test-1.wiki
+++ test/diff-test-1.wiki
@@ -1,9 +1,9 @@
11
 <title>Graph Test One</title>
22
33
 This page contains list of URLs of interesting diffs.
4
-Click on all URLs, one by one, to verify
4
+Click on all URLs, one by one, to verify
55
 the correct operation of the diff logic.
66
77
 * <a href="../../../info/030035345c#chunk73" target="testwindow">
88
 Multiple edits on a single line.</a> This is an SQLite version
99
 update diff. It is a large diff and contains many other interesting
1010
--- test/diff-test-1.wiki
+++ test/diff-test-1.wiki
@@ -1,9 +1,9 @@
1 <title>Graph Test One</title>
2
3 This page contains list of URLs of interesting diffs.
4 Click on all URLs, one by one, to verify
5 the correct operation of the diff logic.
6
7 * <a href="../../../info/030035345c#chunk73" target="testwindow">
8 Multiple edits on a single line.</a> This is an SQLite version
9 update diff. It is a large diff and contains many other interesting
10
--- test/diff-test-1.wiki
+++ test/diff-test-1.wiki
@@ -1,9 +1,9 @@
1 <title>Graph Test One</title>
2
3 This page contains list of URLs of interesting diffs.
4 Click on all URLs, one by one, to verify
5 the correct operation of the diff logic.
6
7 * <a href="../../../info/030035345c#chunk73" target="testwindow">
8 Multiple edits on a single line.</a> This is an SQLite version
9 update diff. It is a large diff and contains many other interesting
10
M test/merge1.test
+2 -2
--- test/merge1.test
+++ test/merge1.test
@@ -337,11 +337,11 @@
337337
338338
 write_file_indented t2 {
339339
 abcd
340340
 efgh 2
341341
 ijkl 2
342
- mnop
342
+ mnop
343343
 qrst
344344
 uvwx
345345
 yzAB 2
346346
 CDEF 2
347347
 GHIJ 2
@@ -368,11 +368,11 @@
368368
 write_file_indented t23 {
369369
 abcd
370370
 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
371371
 efgh 2
372372
 ijkl 2
373
- mnop
373
+ mnop
374374
 qrst
375375
 uvwx
376376
 yzAB 2
377377
 CDEF 2
378378
 GHIJ 2
379379
--- test/merge1.test
+++ test/merge1.test
@@ -337,11 +337,11 @@
337
338 write_file_indented t2 {
339 abcd
340 efgh 2
341 ijkl 2
342 mnop
343 qrst
344 uvwx
345 yzAB 2
346 CDEF 2
347 GHIJ 2
@@ -368,11 +368,11 @@
368 write_file_indented t23 {
369 abcd
370 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
371 efgh 2
372 ijkl 2
373 mnop
374 qrst
375 uvwx
376 yzAB 2
377 CDEF 2
378 GHIJ 2
379
--- test/merge1.test
+++ test/merge1.test
@@ -337,11 +337,11 @@
337
338 write_file_indented t2 {
339 abcd
340 efgh 2
341 ijkl 2
342 mnop
343 qrst
344 uvwx
345 yzAB 2
346 CDEF 2
347 GHIJ 2
@@ -368,11 +368,11 @@
368 write_file_indented t23 {
369 abcd
370 <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<<
371 efgh 2
372 ijkl 2
373 mnop
374 qrst
375 uvwx
376 yzAB 2
377 CDEF 2
378 GHIJ 2
379
M test/merge3.test
+1 -1
--- test/merge3.test
+++ test/merge3.test
@@ -295,11 +295,11 @@
295295
 } {
296296
 6 7 8
297297
 } {
298298
 2 3 4 5
299299
 } {
300
-
300
+
301301
 }
302302
 merge-test 44 {
303303
 2 3 4 5 6 7 8
304304
 } {
305305
 6 7 8
306306
--- test/merge3.test
+++ test/merge3.test
@@ -295,11 +295,11 @@
295 } {
296 6 7 8
297 } {
298 2 3 4 5
299 } {
300
301 }
302 merge-test 44 {
303 2 3 4 5 6 7 8
304 } {
305 6 7 8
306
--- test/merge3.test
+++ test/merge3.test
@@ -295,11 +295,11 @@
295 } {
296 6 7 8
297 } {
298 2 3 4 5
299 } {
300
301 }
302 merge-test 44 {
303 2 3 4 5 6 7 8
304 } {
305 6 7 8
306
M test/merge5.test
+1 -1
--- test/merge5.test
+++ test/merge5.test
@@ -33,11 +33,11 @@
3333
 protOut " Expected:\n $expected"
3434
 protOut " Got:\n $result"
3535
 test merge5-$testid 0
3636
 } else {
3737
 test merge5-$testid 1
38
- }
38
+ }
3939
 }
4040
4141
 require_no_open_checkout; test_setup ""
4242
4343
 # Construct a test repository
4444
--- test/merge5.test
+++ test/merge5.test
@@ -33,11 +33,11 @@
33 protOut " Expected:\n $expected"
34 protOut " Got:\n $result"
35 test merge5-$testid 0
36 } else {
37 test merge5-$testid 1
38 }
39 }
40
41 require_no_open_checkout; test_setup ""
42
43 # Construct a test repository
44
--- test/merge5.test
+++ test/merge5.test
@@ -33,11 +33,11 @@
33 protOut " Expected:\n $expected"
34 protOut " Got:\n $result"
35 test merge5-$testid 0
36 } else {
37 test merge5-$testid 1
38 }
39 }
40
41 require_no_open_checkout; test_setup ""
42
43 # Construct a test repository
44
M test/revert.test
+1 -1
--- test/revert.test
+++ test/revert.test
@@ -15,11 +15,11 @@
1515
 #
1616
 ############################################################################
1717
 #
1818
 #
1919
 # Tests for 'fossil revert'
20
-#
20
+#
2121
 #
2222
2323
 # Test 'fossil revert' against expected results from 'fossil changes' and
2424
 # 'fossil addremove -n', as well as by verifying the existence of files
2525
 # on the file system. 'fossil undo' is called after each test
2626
--- test/revert.test
+++ test/revert.test
@@ -15,11 +15,11 @@
15 #
16 ############################################################################
17 #
18 #
19 # Tests for 'fossil revert'
20 #
21 #
22
23 # Test 'fossil revert' against expected results from 'fossil changes' and
24 # 'fossil addremove -n', as well as by verifying the existence of files
25 # on the file system. 'fossil undo' is called after each test
26
--- test/revert.test
+++ test/revert.test
@@ -15,11 +15,11 @@
15 #
16 ############################################################################
17 #
18 #
19 # Tests for 'fossil revert'
20 #
21 #
22
23 # Test 'fossil revert' against expected results from 'fossil changes' and
24 # 'fossil addremove -n', as well as by verifying the existence of files
25 # on the file system. 'fossil undo' is called after each test
26

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button