Fossil SCM
Disable the time_fudge corrections for check-ins that have mtimes that are modified using a tag.
Commit
e08f9c042309d8812b066a8fdd59d3c737b4b84456b912dfbc33a6e884616ef6
Parent
33fb3a97372f362…
1 file changed
+5
-1
+5
-1
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -1754,11 +1754,12 @@ | ||
| 1754 | 1754 | db_finalize(&q); |
| 1755 | 1755 | db_finalize(&u); |
| 1756 | 1756 | if( db_exists("SELECT 1 FROM time_fudge") ){ |
| 1757 | 1757 | db_multi_exec( |
| 1758 | 1758 | "UPDATE event SET mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" |
| 1759 | - " WHERE objid IN (SELECT mid FROM time_fudge);" | |
| 1759 | + " WHERE objid IN (SELECT mid FROM time_fudge)" | |
| 1760 | + " AND (mtime=omtime OR omtime IS NULL)" | |
| 1760 | 1761 | ); |
| 1761 | 1762 | } |
| 1762 | 1763 | db_multi_exec("DROP TABLE time_fudge;"); |
| 1763 | 1764 | |
| 1764 | 1765 | db_end_transaction(0); |
| @@ -1929,10 +1930,13 @@ | ||
| 1929 | 1930 | int parentid = 0; |
| 1930 | 1931 | int permitHooks = (flags & MC_PERMIT_HOOKS); |
| 1931 | 1932 | const char *zScript = 0; |
| 1932 | 1933 | const char *zUuid = 0; |
| 1933 | 1934 | |
| 1935 | + if( g.fSqlTrace ){ | |
| 1936 | + fossil_trace("-- manifest_crosslink(%d)\n", rid); | |
| 1937 | + } | |
| 1934 | 1938 | if( (p = manifest_cache_find(rid))!=0 ){ |
| 1935 | 1939 | blob_reset(pContent); |
| 1936 | 1940 | }else if( (p = manifest_parse(pContent, rid, 0))==0 ){ |
| 1937 | 1941 | assert( blob_is_reset(pContent) || pContent==0 ); |
| 1938 | 1942 | if( (flags & MC_NO_ERRORS)==0 ){ |
| 1939 | 1943 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1754,11 +1754,12 @@ | |
| 1754 | db_finalize(&q); |
| 1755 | db_finalize(&u); |
| 1756 | if( db_exists("SELECT 1 FROM time_fudge") ){ |
| 1757 | db_multi_exec( |
| 1758 | "UPDATE event SET mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" |
| 1759 | " WHERE objid IN (SELECT mid FROM time_fudge);" |
| 1760 | ); |
| 1761 | } |
| 1762 | db_multi_exec("DROP TABLE time_fudge;"); |
| 1763 | |
| 1764 | db_end_transaction(0); |
| @@ -1929,10 +1930,13 @@ | |
| 1929 | int parentid = 0; |
| 1930 | int permitHooks = (flags & MC_PERMIT_HOOKS); |
| 1931 | const char *zScript = 0; |
| 1932 | const char *zUuid = 0; |
| 1933 | |
| 1934 | if( (p = manifest_cache_find(rid))!=0 ){ |
| 1935 | blob_reset(pContent); |
| 1936 | }else if( (p = manifest_parse(pContent, rid, 0))==0 ){ |
| 1937 | assert( blob_is_reset(pContent) || pContent==0 ); |
| 1938 | if( (flags & MC_NO_ERRORS)==0 ){ |
| 1939 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -1754,11 +1754,12 @@ | |
| 1754 | db_finalize(&q); |
| 1755 | db_finalize(&u); |
| 1756 | if( db_exists("SELECT 1 FROM time_fudge") ){ |
| 1757 | db_multi_exec( |
| 1758 | "UPDATE event SET mtime=(SELECT m1 FROM time_fudge WHERE mid=objid)" |
| 1759 | " WHERE objid IN (SELECT mid FROM time_fudge)" |
| 1760 | " AND (mtime=omtime OR omtime IS NULL)" |
| 1761 | ); |
| 1762 | } |
| 1763 | db_multi_exec("DROP TABLE time_fudge;"); |
| 1764 | |
| 1765 | db_end_transaction(0); |
| @@ -1929,10 +1930,13 @@ | |
| 1930 | int parentid = 0; |
| 1931 | int permitHooks = (flags & MC_PERMIT_HOOKS); |
| 1932 | const char *zScript = 0; |
| 1933 | const char *zUuid = 0; |
| 1934 | |
| 1935 | if( g.fSqlTrace ){ |
| 1936 | fossil_trace("-- manifest_crosslink(%d)\n", rid); |
| 1937 | } |
| 1938 | if( (p = manifest_cache_find(rid))!=0 ){ |
| 1939 | blob_reset(pContent); |
| 1940 | }else if( (p = manifest_parse(pContent, rid, 0))==0 ){ |
| 1941 | assert( blob_is_reset(pContent) || pContent==0 ); |
| 1942 | if( (flags & MC_NO_ERRORS)==0 ){ |
| 1943 |