Fossil SCM

Make annotation work with UTF-16 files. Remove some unnecessary end-of-line spaces in (UTF-8 and UTF-16) text files.

jan.nijtmans 2014-03-07 11:42 trunk
Commit 46459fd92244555045631b47470116e7864c3bb1
Parent f00167e4e10009e…
10 files changed +2 -2 +12 -12 +2 +2 +1 -1 +1 -1 +1 -1 +1 -1 +2 -2 +2 -2
~ BUILD.txt ~ COPYRIGHT-BSD2.txt ~ src/diff.c ~ src/diff.c ~ test/utf16be.txt ~ test/utf16be.txt ~ test/utf16le.txt ~ test/utf16le.txt ~ www/changes.wiki ~ www/changes.wiki
M BUILD.txt
+2 -2
--- BUILD.txt
+++ BUILD.txt
@@ -22,11 +22,11 @@
2222
2323
 cd win; nmake /f Makefile.msc
2424
2525
 If you have trouble, or you want to do something fancy, just look at
2626
 Makefile.classic. There are 6 configuration options that are all well
27
-commented. Instead of editing the Makefile.classic, consider copying
27
+commented. Instead of editing the Makefile.classic, consider copying
2828
 Makefile.classic to an alternative name such as "GNUMakefile",
2929
 "BSDMakefile", or "makefile" and editing the copy.
3030
3131
3232
 BUILDING OUTSIDE THE SOURCE TREE
@@ -61,11 +61,11 @@
6161
 Do not edit src/main.mk directly. Update src/makemake.tcl and
6262
 then rerun it.
6363
6464
 * The *.h header files are automatically generated using a program
6565
 called "makeheaders". Source code to the makeheaders program is
66
- found in src/makeheaders.c. Documentation is found in
66
+ found in src/makeheaders.c. Documentation is found in
6767
 src/makeheaders.html.
6868
6969
 * Most *.c source files are preprocessed using a program called
7070
 "translate". The sources to translate are found in src/translate.c.
7171
 A header comment in src/translate.c explains in detail what it does.
7272
--- BUILD.txt
+++ BUILD.txt
@@ -22,11 +22,11 @@
22
23 cd win; nmake /f Makefile.msc
24
25 If you have trouble, or you want to do something fancy, just look at
26 Makefile.classic. There are 6 configuration options that are all well
27 commented. Instead of editing the Makefile.classic, consider copying
28 Makefile.classic to an alternative name such as "GNUMakefile",
29 "BSDMakefile", or "makefile" and editing the copy.
30
31
32 BUILDING OUTSIDE THE SOURCE TREE
@@ -61,11 +61,11 @@
61 Do not edit src/main.mk directly. Update src/makemake.tcl and
62 then rerun it.
63
64 * The *.h header files are automatically generated using a program
65 called "makeheaders". Source code to the makeheaders program is
66 found in src/makeheaders.c. Documentation is found in
67 src/makeheaders.html.
68
69 * Most *.c source files are preprocessed using a program called
70 "translate". The sources to translate are found in src/translate.c.
71 A header comment in src/translate.c explains in detail what it does.
72
--- BUILD.txt
+++ BUILD.txt
@@ -22,11 +22,11 @@
22
23 cd win; nmake /f Makefile.msc
24
25 If you have trouble, or you want to do something fancy, just look at
26 Makefile.classic. There are 6 configuration options that are all well
27 commented. Instead of editing the Makefile.classic, consider copying
28 Makefile.classic to an alternative name such as "GNUMakefile",
29 "BSDMakefile", or "makefile" and editing the copy.
30
31
32 BUILDING OUTSIDE THE SOURCE TREE
@@ -61,11 +61,11 @@
61 Do not edit src/main.mk directly. Update src/makemake.tcl and
62 then rerun it.
63
64 * The *.h header files are automatically generated using a program
65 called "makeheaders". Source code to the makeheaders program is
66 found in src/makeheaders.c. Documentation is found in
67 src/makeheaders.html.
68
69 * Most *.c source files are preprocessed using a program called
70 "translate". The sources to translate are found in src/translate.c.
71 A header comment in src/translate.c explains in detail what it does.
72
M COPYRIGHT-BSD2.txt
+12 -12
--- COPYRIGHT-BSD2.txt
+++ COPYRIGHT-BSD2.txt
@@ -1,31 +1,31 @@
11
 Copyright 2007 D. Richard Hipp. All rights reserved.
22
3
-Redistribution and use in source and binary forms, with or
4
-without modification, are permitted provided that the
3
+Redistribution and use in source and binary forms, with or
4
+without modification, are permitted provided that the
55
 following conditions are met:
66
77
 1. Redistributions of source code must retain the above
8
- copyright notice, this list of conditions and the
8
+ copyright notice, this list of conditions and the
99
 following disclaimer.
1010
1111
 2. Redistributions in binary form must reproduce the above
1212
 copyright notice, this list of conditions and the
1313
 following disclaimer in the documentation and/or other
1414
 materials provided with the distribution.
1515
16
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
17
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
17
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
1818
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
19
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
2020
 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
21
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
2323
 BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
25
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
24
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
25
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2626
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2727
28
-The views and conclusions contained in the software and documentation
29
-are those of the authors and contributors and should not be interpreted
28
+The views and conclusions contained in the software and documentation
29
+are those of the authors and contributors and should not be interpreted
3030
 as representing official policies, either expressed or implied, of anybody
3131
 else.
3232
--- COPYRIGHT-BSD2.txt
+++ COPYRIGHT-BSD2.txt
@@ -1,31 +1,31 @@
1 Copyright 2007 D. Richard Hipp. All rights reserved.
2
3 Redistribution and use in source and binary forms, with or
4 without modification, are permitted provided that the
5 following conditions are met:
6
7 1. Redistributions of source code must retain the above
8 copyright notice, this list of conditions and the
9 following disclaimer.
10
11 2. Redistributions in binary form must reproduce the above
12 copyright notice, this list of conditions and the
13 following disclaimer in the documentation and/or other
14 materials provided with the distribution.
15
16 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
17 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
20 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
23 BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
25 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
26 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
28 The views and conclusions contained in the software and documentation
29 are those of the authors and contributors and should not be interpreted
30 as representing official policies, either expressed or implied, of anybody
31 else.
32
--- COPYRIGHT-BSD2.txt
+++ COPYRIGHT-BSD2.txt
@@ -1,31 +1,31 @@
1 Copyright 2007 D. Richard Hipp. All rights reserved.
2
3 Redistribution and use in source and binary forms, with or
4 without modification, are permitted provided that the
5 following conditions are met:
6
7 1. Redistributions of source code must retain the above
8 copyright notice, this list of conditions and the
9 following disclaimer.
10
11 2. Redistributions in binary form must reproduce the above
12 copyright notice, this list of conditions and the
13 following disclaimer in the documentation and/or other
14 materials provided with the distribution.
15
16 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
17 OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE
20 LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
23 BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
25 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
26 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27
28 The views and conclusions contained in the software and documentation
29 are those of the authors and contributors and should not be interpreted
30 as representing official policies, either expressed or implied, of anybody
31 else.
32
M src/diff.c
+2
--- src/diff.c
+++ src/diff.c
@@ -2099,10 +2099,11 @@
20992099
 }
21002100
 if( !content_get(rid, &toAnnotate) ){
21012101
 fossil_fatal("unable to retrieve content of artifact #%d", rid);
21022102
 }
21032103
 if( iLimit<=0 ) iLimit = 1000000000;
2104
+ blob_to_utf8_no_bom(&toAnnotate, 0);
21042105
 annotation_start(p, &toAnnotate, diffFlags);
21052106
 db_begin_transaction();
21062107
 db_multi_exec(
21072108
 "CREATE TEMP TABLE IF NOT EXISTS vseen(rid INTEGER PRIMARY KEY);"
21082109
 "DELETE FROM vseen;"
@@ -2133,10 +2134,11 @@
21332134
 p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
21342135
 p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
21352136
 p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
21362137
 if( p->nVers ){
21372138
 content_get(rid, &step);
2139
+ blob_to_utf8_no_bom(&step, 0);
21382140
 annotation_step(p, &step, p->nVers-1, diffFlags);
21392141
 blob_reset(&step);
21402142
 }
21412143
 p->nVers++;
21422144
 db_bind_int(&ins, ":rid", rid);
21432145
--- src/diff.c
+++ src/diff.c
@@ -2099,10 +2099,11 @@
2099 }
2100 if( !content_get(rid, &toAnnotate) ){
2101 fossil_fatal("unable to retrieve content of artifact #%d", rid);
2102 }
2103 if( iLimit<=0 ) iLimit = 1000000000;
 
2104 annotation_start(p, &toAnnotate, diffFlags);
2105 db_begin_transaction();
2106 db_multi_exec(
2107 "CREATE TEMP TABLE IF NOT EXISTS vseen(rid INTEGER PRIMARY KEY);"
2108 "DELETE FROM vseen;"
@@ -2133,10 +2134,11 @@
2133 p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
2134 p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
2135 p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
2136 if( p->nVers ){
2137 content_get(rid, &step);
 
2138 annotation_step(p, &step, p->nVers-1, diffFlags);
2139 blob_reset(&step);
2140 }
2141 p->nVers++;
2142 db_bind_int(&ins, ":rid", rid);
2143
--- src/diff.c
+++ src/diff.c
@@ -2099,10 +2099,11 @@
2099 }
2100 if( !content_get(rid, &toAnnotate) ){
2101 fossil_fatal("unable to retrieve content of artifact #%d", rid);
2102 }
2103 if( iLimit<=0 ) iLimit = 1000000000;
2104 blob_to_utf8_no_bom(&toAnnotate, 0);
2105 annotation_start(p, &toAnnotate, diffFlags);
2106 db_begin_transaction();
2107 db_multi_exec(
2108 "CREATE TEMP TABLE IF NOT EXISTS vseen(rid INTEGER PRIMARY KEY);"
2109 "DELETE FROM vseen;"
@@ -2133,10 +2134,11 @@
2134 p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
2135 p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
2136 p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
2137 if( p->nVers ){
2138 content_get(rid, &step);
2139 blob_to_utf8_no_bom(&step, 0);
2140 annotation_step(p, &step, p->nVers-1, diffFlags);
2141 blob_reset(&step);
2142 }
2143 p->nVers++;
2144 db_bind_int(&ins, ":rid", rid);
2145
M src/diff.c
+2
--- src/diff.c
+++ src/diff.c
@@ -2099,10 +2099,11 @@
20992099
 }
21002100
 if( !content_get(rid, &toAnnotate) ){
21012101
 fossil_fatal("unable to retrieve content of artifact #%d", rid);
21022102
 }
21032103
 if( iLimit<=0 ) iLimit = 1000000000;
2104
+ blob_to_utf8_no_bom(&toAnnotate, 0);
21042105
 annotation_start(p, &toAnnotate, diffFlags);
21052106
 db_begin_transaction();
21062107
 db_multi_exec(
21072108
 "CREATE TEMP TABLE IF NOT EXISTS vseen(rid INTEGER PRIMARY KEY);"
21082109
 "DELETE FROM vseen;"
@@ -2133,10 +2134,11 @@
21332134
 p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
21342135
 p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
21352136
 p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
21362137
 if( p->nVers ){
21372138
 content_get(rid, &step);
2139
+ blob_to_utf8_no_bom(&step, 0);
21382140
 annotation_step(p, &step, p->nVers-1, diffFlags);
21392141
 blob_reset(&step);
21402142
 }
21412143
 p->nVers++;
21422144
 db_bind_int(&ins, ":rid", rid);
21432145
--- src/diff.c
+++ src/diff.c
@@ -2099,10 +2099,11 @@
2099 }
2100 if( !content_get(rid, &toAnnotate) ){
2101 fossil_fatal("unable to retrieve content of artifact #%d", rid);
2102 }
2103 if( iLimit<=0 ) iLimit = 1000000000;
 
2104 annotation_start(p, &toAnnotate, diffFlags);
2105 db_begin_transaction();
2106 db_multi_exec(
2107 "CREATE TEMP TABLE IF NOT EXISTS vseen(rid INTEGER PRIMARY KEY);"
2108 "DELETE FROM vseen;"
@@ -2133,10 +2134,11 @@
2133 p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
2134 p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
2135 p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
2136 if( p->nVers ){
2137 content_get(rid, &step);
 
2138 annotation_step(p, &step, p->nVers-1, diffFlags);
2139 blob_reset(&step);
2140 }
2141 p->nVers++;
2142 db_bind_int(&ins, ":rid", rid);
2143
--- src/diff.c
+++ src/diff.c
@@ -2099,10 +2099,11 @@
2099 }
2100 if( !content_get(rid, &toAnnotate) ){
2101 fossil_fatal("unable to retrieve content of artifact #%d", rid);
2102 }
2103 if( iLimit<=0 ) iLimit = 1000000000;
2104 blob_to_utf8_no_bom(&toAnnotate, 0);
2105 annotation_start(p, &toAnnotate, diffFlags);
2106 db_begin_transaction();
2107 db_multi_exec(
2108 "CREATE TEMP TABLE IF NOT EXISTS vseen(rid INTEGER PRIMARY KEY);"
2109 "DELETE FROM vseen;"
@@ -2133,10 +2134,11 @@
2134 p->aVers[p->nVers].zMUuid = fossil_strdup(db_column_text(&q, 1));
2135 p->aVers[p->nVers].zDate = fossil_strdup(db_column_text(&q, 2));
2136 p->aVers[p->nVers].zUser = fossil_strdup(db_column_text(&q, 3));
2137 if( p->nVers ){
2138 content_get(rid, &step);
2139 blob_to_utf8_no_bom(&step, 0);
2140 annotation_step(p, &step, p->nVers-1, diffFlags);
2141 blob_reset(&step);
2142 }
2143 p->nVers++;
2144 db_bind_int(&ins, ":rid", rid);
2145
M test/utf16be.txt
+1 -1
--- test/utf16be.txt
+++ test/utf16be.txt
@@ -12,11 +12,11 @@
1212
1313
 Test procedures:
1414
1515
 1. Verify that this file is correctly display using the /artifact
1616
 webpage.
17
-
17
+
1818
 2. Verify that this file is correctly displayed by the /doc webpage.
1919
2020
 3. Verify that changes to are correctly displayed by the /fdiff webpage.
2121
2222
 4. Verify that the "fossil diff" command correctly displays changes
2323
--- test/utf16be.txt
+++ test/utf16be.txt
@@ -12,11 +12,11 @@
12
13 Test procedures:
14
15 1. Verify that this file is correctly display using the /artifact
16 webpage.
17
18 2. Verify that this file is correctly displayed by the /doc webpage.
19
20 3. Verify that changes to are correctly displayed by the /fdiff webpage.
21
22 4. Verify that the "fossil diff" command correctly displays changes
23
--- test/utf16be.txt
+++ test/utf16be.txt
@@ -12,11 +12,11 @@
12
13 Test procedures:
14
15 1. Verify that this file is correctly display using the /artifact
16 webpage.
17
18 2. Verify that this file is correctly displayed by the /doc webpage.
19
20 3. Verify that changes to are correctly displayed by the /fdiff webpage.
21
22 4. Verify that the "fossil diff" command correctly displays changes
23
M test/utf16be.txt
+1 -1
--- test/utf16be.txt
+++ test/utf16be.txt
@@ -12,11 +12,11 @@
1212
1313
 Test procedures:
1414
1515
 1. Verify that this file is correctly display using the /artifact
1616
 webpage.
17
-
17
+
1818
 2. Verify that this file is correctly displayed by the /doc webpage.
1919
2020
 3. Verify that changes to are correctly displayed by the /fdiff webpage.
2121
2222
 4. Verify that the "fossil diff" command correctly displays changes
2323
--- test/utf16be.txt
+++ test/utf16be.txt
@@ -12,11 +12,11 @@
12
13 Test procedures:
14
15 1. Verify that this file is correctly display using the /artifact
16 webpage.
17
18 2. Verify that this file is correctly displayed by the /doc webpage.
19
20 3. Verify that changes to are correctly displayed by the /fdiff webpage.
21
22 4. Verify that the "fossil diff" command correctly displays changes
23
--- test/utf16be.txt
+++ test/utf16be.txt
@@ -12,11 +12,11 @@
12
13 Test procedures:
14
15 1. Verify that this file is correctly display using the /artifact
16 webpage.
17
18 2. Verify that this file is correctly displayed by the /doc webpage.
19
20 3. Verify that changes to are correctly displayed by the /fdiff webpage.
21
22 4. Verify that the "fossil diff" command correctly displays changes
23
M test/utf16le.txt
+1 -1
--- test/utf16le.txt
+++ test/utf16le.txt
@@ -12,11 +12,11 @@
1212
1313
 Test procedures:
1414
1515
 1. Verify that this file is correctly display using the /artifact
1616
 webpage.
17
-
17
+
1818
 2. Verify that this file is correctly displayed by the /doc webpage.
1919
2020
 3. Verify that changes to are correctly displayed by the /fdiff webpage.
2121
2222
 4. Verify that the "fossil diff" command correctly displays changes
2323
--- test/utf16le.txt
+++ test/utf16le.txt
@@ -12,11 +12,11 @@
12
13 Test procedures:
14
15 1. Verify that this file is correctly display using the /artifact
16 webpage.
17
18 2. Verify that this file is correctly displayed by the /doc webpage.
19
20 3. Verify that changes to are correctly displayed by the /fdiff webpage.
21
22 4. Verify that the "fossil diff" command correctly displays changes
23
--- test/utf16le.txt
+++ test/utf16le.txt
@@ -12,11 +12,11 @@
12
13 Test procedures:
14
15 1. Verify that this file is correctly display using the /artifact
16 webpage.
17
18 2. Verify that this file is correctly displayed by the /doc webpage.
19
20 3. Verify that changes to are correctly displayed by the /fdiff webpage.
21
22 4. Verify that the "fossil diff" command correctly displays changes
23
M test/utf16le.txt
+1 -1
--- test/utf16le.txt
+++ test/utf16le.txt
@@ -12,11 +12,11 @@
1212
1313
 Test procedures:
1414
1515
 1. Verify that this file is correctly display using the /artifact
1616
 webpage.
17
-
17
+
1818
 2. Verify that this file is correctly displayed by the /doc webpage.
1919
2020
 3. Verify that changes to are correctly displayed by the /fdiff webpage.
2121
2222
 4. Verify that the "fossil diff" command correctly displays changes
2323
--- test/utf16le.txt
+++ test/utf16le.txt
@@ -12,11 +12,11 @@
12
13 Test procedures:
14
15 1. Verify that this file is correctly display using the /artifact
16 webpage.
17
18 2. Verify that this file is correctly displayed by the /doc webpage.
19
20 3. Verify that changes to are correctly displayed by the /fdiff webpage.
21
22 4. Verify that the "fossil diff" command correctly displays changes
23
--- test/utf16le.txt
+++ test/utf16le.txt
@@ -12,11 +12,11 @@
12
13 Test procedures:
14
15 1. Verify that this file is correctly display using the /artifact
16 webpage.
17
18 2. Verify that this file is correctly displayed by the /doc webpage.
19
20 3. Verify that changes to are correctly displayed by the /fdiff webpage.
21
22 4. Verify that the "fossil diff" command correctly displays changes
23
M www/changes.wiki
+2 -2
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,10 +1,10 @@
11
 <title>Change Log</title>
22
33
 <h2>Changes For Version 1.29 (as yet unreleased)</h2>
4
- * Add the ability to display content and diffs for UTF16 text files
5
- in the web interface.
4
+ * Add the ability to display content, diffs and annotations for UTF16
5
+ text files in the web interface.
66
 * Add the "SaveAs..." button to the graphical diff display that results
77
 from using the --tk option with the [/help/diff | fossil diff] command.
88
 * Honor timezones in imports from git.
99
 * The [/reports] page now requires Read ("o") permissions. The "byweek"
1010
 report now properly propagates the selected year through the event type
1111
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,10 +1,10 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.29 (as yet unreleased)</h2>
4 * Add the ability to display content and diffs for UTF16 text files
5 in the web interface.
6 * Add the "SaveAs..." button to the graphical diff display that results
7 from using the --tk option with the [/help/diff | fossil diff] command.
8 * Honor timezones in imports from git.
9 * The [/reports] page now requires Read ("o") permissions. The "byweek"
10 report now properly propagates the selected year through the event type
11
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,10 +1,10 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.29 (as yet unreleased)</h2>
4 * Add the ability to display content, diffs and annotations for UTF16
5 text files in the web interface.
6 * Add the "SaveAs..." button to the graphical diff display that results
7 from using the --tk option with the [/help/diff | fossil diff] command.
8 * Honor timezones in imports from git.
9 * The [/reports] page now requires Read ("o") permissions. The "byweek"
10 report now properly propagates the selected year through the event type
11
M www/changes.wiki
+2 -2
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,10 +1,10 @@
11
 <title>Change Log</title>
22
33
 <h2>Changes For Version 1.29 (as yet unreleased)</h2>
4
- * Add the ability to display content and diffs for UTF16 text files
5
- in the web interface.
4
+ * Add the ability to display content, diffs and annotations for UTF16
5
+ text files in the web interface.
66
 * Add the "SaveAs..." button to the graphical diff display that results
77
 from using the --tk option with the [/help/diff | fossil diff] command.
88
 * Honor timezones in imports from git.
99
 * The [/reports] page now requires Read ("o") permissions. The "byweek"
1010
 report now properly propagates the selected year through the event type
1111
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,10 +1,10 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.29 (as yet unreleased)</h2>
4 * Add the ability to display content and diffs for UTF16 text files
5 in the web interface.
6 * Add the "SaveAs..." button to the graphical diff display that results
7 from using the --tk option with the [/help/diff | fossil diff] command.
8 * Honor timezones in imports from git.
9 * The [/reports] page now requires Read ("o") permissions. The "byweek"
10 report now properly propagates the selected year through the event type
11
--- www/changes.wiki
+++ www/changes.wiki
@@ -1,10 +1,10 @@
1 <title>Change Log</title>
2
3 <h2>Changes For Version 1.29 (as yet unreleased)</h2>
4 * Add the ability to display content, diffs and annotations for UTF16
5 text files in the web interface.
6 * Add the "SaveAs..." button to the graphical diff display that results
7 from using the --tk option with the [/help/diff | fossil diff] command.
8 * Honor timezones in imports from git.
9 * The [/reports] page now requires Read ("o") permissions. The "byweek"
10 report now properly propagates the selected year through the event type
11

Keyboard Shortcuts

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