Fossil SCM
Merge the deliberate fork back together.
Commit
ac4ddd88930f1a63a3f10c41a55ef1f6d9f9b5145149f0ef0453c934322cbd38
Parent
707743def0a1a11…
2 files changed
+1
-1
+15
-1
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -2,11 +2,11 @@ | ||
| 2 | 2 | ** Copyright (c) 2007 D. Richard Hipp |
| 3 | 3 | ** |
| 4 | 4 | ** This program is free software; you can redistribute it and/or |
| 5 | 5 | ** modify it under the terms of the Simplified BSD License (also |
| 6 | 6 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 7 | - | |
| 7 | +** | |
| 8 | 8 | ** This program is distributed in the hope that it will be useful, |
| 9 | 9 | ** but without any warranty; without even the implied warranty of |
| 10 | 10 | ** merchantability or fitness for a particular purpose. |
| 11 | 11 | ** |
| 12 | 12 | ** Author contact information: |
| 13 | 13 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2,11 +2,11 @@ | |
| 2 | ** Copyright (c) 2007 D. Richard Hipp |
| 3 | ** |
| 4 | ** This program is free software; you can redistribute it and/or |
| 5 | ** modify it under the terms of the Simplified BSD License (also |
| 6 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 7 | |
| 8 | ** This program is distributed in the hope that it will be useful, |
| 9 | ** but without any warranty; without even the implied warranty of |
| 10 | ** merchantability or fitness for a particular purpose. |
| 11 | ** |
| 12 | ** Author contact information: |
| 13 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -2,11 +2,11 @@ | |
| 2 | ** Copyright (c) 2007 D. Richard Hipp |
| 3 | ** |
| 4 | ** This program is free software; you can redistribute it and/or |
| 5 | ** modify it under the terms of the Simplified BSD License (also |
| 6 | ** known as the "2-Clause License" or "FreeBSD License".) |
| 7 | ** |
| 8 | ** This program is distributed in the hope that it will be useful, |
| 9 | ** but without any warranty; without even the implied warranty of |
| 10 | ** merchantability or fitness for a particular purpose. |
| 11 | ** |
| 12 | ** Author contact information: |
| 13 |
+15
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -1877,11 +1877,25 @@ | ||
| 1877 | 1877 | " HAVING count(*)>1;\n" |
| 1878 | 1878 | "INSERT OR IGNORE INTO rnfork(rid)" |
| 1879 | 1879 | " SELECT cid FROM plink\n" |
| 1880 | 1880 | " WHERE (SELECT value FROM tagxref WHERE tagid=%d AND rid=cid)==" |
| 1881 | 1881 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=pid)\n" |
| 1882 | - " AND pid IN rnfork;", | |
| 1882 | + " GROUP BY cid" | |
| 1883 | + " HAVING count(*)>1;\n", | |
| 1884 | + TAG_BRANCH, TAG_BRANCH, TAG_BRANCH, TAG_BRANCH | |
| 1885 | + ); | |
| 1886 | + db_multi_exec( | |
| 1887 | + "INSERT OR IGNORE INTO rnfork(rid)\n" | |
| 1888 | + " SELECT cid FROM plink\n" | |
| 1889 | + " WHERE pid IN rnfork" | |
| 1890 | + " AND (SELECT value FROM tagxref WHERE tagid=%d AND rid=cid)==" | |
| 1891 | + " (SELECT value FROM tagxref WHERE tagid=%d AND rid=pid)\n" | |
| 1892 | + " UNION " | |
| 1893 | + " SELECT pid FROM plink\n" | |
| 1894 | + " WHERE cid IN rnfork" | |
| 1895 | + " AND (SELECT value FROM tagxref WHERE tagid=%d AND rid=cid)==" | |
| 1896 | + " (SELECT value FROM tagxref WHERE tagid=%d AND rid=pid)\n", | |
| 1883 | 1897 | TAG_BRANCH, TAG_BRANCH, TAG_BRANCH, TAG_BRANCH |
| 1884 | 1898 | ); |
| 1885 | 1899 | tmFlags |= TIMELINE_UNHIDE; |
| 1886 | 1900 | zType = "ci"; |
| 1887 | 1901 | disableY = 1; |
| 1888 | 1902 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1877,11 +1877,25 @@ | |
| 1877 | " HAVING count(*)>1;\n" |
| 1878 | "INSERT OR IGNORE INTO rnfork(rid)" |
| 1879 | " SELECT cid FROM plink\n" |
| 1880 | " WHERE (SELECT value FROM tagxref WHERE tagid=%d AND rid=cid)==" |
| 1881 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=pid)\n" |
| 1882 | " AND pid IN rnfork;", |
| 1883 | TAG_BRANCH, TAG_BRANCH, TAG_BRANCH, TAG_BRANCH |
| 1884 | ); |
| 1885 | tmFlags |= TIMELINE_UNHIDE; |
| 1886 | zType = "ci"; |
| 1887 | disableY = 1; |
| 1888 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -1877,11 +1877,25 @@ | |
| 1877 | " HAVING count(*)>1;\n" |
| 1878 | "INSERT OR IGNORE INTO rnfork(rid)" |
| 1879 | " SELECT cid FROM plink\n" |
| 1880 | " WHERE (SELECT value FROM tagxref WHERE tagid=%d AND rid=cid)==" |
| 1881 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=pid)\n" |
| 1882 | " GROUP BY cid" |
| 1883 | " HAVING count(*)>1;\n", |
| 1884 | TAG_BRANCH, TAG_BRANCH, TAG_BRANCH, TAG_BRANCH |
| 1885 | ); |
| 1886 | db_multi_exec( |
| 1887 | "INSERT OR IGNORE INTO rnfork(rid)\n" |
| 1888 | " SELECT cid FROM plink\n" |
| 1889 | " WHERE pid IN rnfork" |
| 1890 | " AND (SELECT value FROM tagxref WHERE tagid=%d AND rid=cid)==" |
| 1891 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=pid)\n" |
| 1892 | " UNION " |
| 1893 | " SELECT pid FROM plink\n" |
| 1894 | " WHERE cid IN rnfork" |
| 1895 | " AND (SELECT value FROM tagxref WHERE tagid=%d AND rid=cid)==" |
| 1896 | " (SELECT value FROM tagxref WHERE tagid=%d AND rid=pid)\n", |
| 1897 | TAG_BRANCH, TAG_BRANCH, TAG_BRANCH, TAG_BRANCH |
| 1898 | ); |
| 1899 | tmFlags |= TIMELINE_UNHIDE; |
| 1900 | zType = "ci"; |
| 1901 | disableY = 1; |
| 1902 |