Fossil SCM
Merge trunk. Undo unintended changes in previous commit
Commit
5583448c56f48337d4b64de0d2d6590f73ca7b07cca2ef991add730c85c35bcd
Parent
b5a11142ee080cc…
3 files changed
+1
+4
-4
+4
-4
+1
| --- src/backoffice.c | ||
| +++ src/backoffice.c | ||
| @@ -381,10 +381,11 @@ | ||
| 381 | 381 | sqlite3_uint64 tmNow; |
| 382 | 382 | |
| 383 | 383 | if( backofficeDb ) return; |
| 384 | 384 | if( g.zRepositoryName==0 ) return; |
| 385 | 385 | if( g.db==0 ) return; |
| 386 | + if( !db_table_exists("repository","config") ) return; | |
| 386 | 387 | tmNow = time(0); |
| 387 | 388 | backofficeReadLease(&x); |
| 388 | 389 | if( x.tmNext>=tmNow && backofficeProcessExists(x.idNext) ){ |
| 389 | 390 | /* Another backoffice process is already queued up to run. This |
| 390 | 391 | ** process does not need to do any backoffice work. */ |
| 391 | 392 |
| --- src/backoffice.c | |
| +++ src/backoffice.c | |
| @@ -381,10 +381,11 @@ | |
| 381 | sqlite3_uint64 tmNow; |
| 382 | |
| 383 | if( backofficeDb ) return; |
| 384 | if( g.zRepositoryName==0 ) return; |
| 385 | if( g.db==0 ) return; |
| 386 | tmNow = time(0); |
| 387 | backofficeReadLease(&x); |
| 388 | if( x.tmNext>=tmNow && backofficeProcessExists(x.idNext) ){ |
| 389 | /* Another backoffice process is already queued up to run. This |
| 390 | ** process does not need to do any backoffice work. */ |
| 391 |
| --- src/backoffice.c | |
| +++ src/backoffice.c | |
| @@ -381,10 +381,11 @@ | |
| 381 | sqlite3_uint64 tmNow; |
| 382 | |
| 383 | if( backofficeDb ) return; |
| 384 | if( g.zRepositoryName==0 ) return; |
| 385 | if( g.db==0 ) return; |
| 386 | if( !db_table_exists("repository","config") ) return; |
| 387 | tmNow = time(0); |
| 388 | backofficeReadLease(&x); |
| 389 | if( x.tmNext>=tmNow && backofficeProcessExists(x.idNext) ){ |
| 390 | /* Another backoffice process is already queued up to run. This |
| 391 | ** process does not need to do any backoffice work. */ |
| 392 |
+4
-4
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -17,14 +17,14 @@ | ||
| 17 | 17 | # |
| 18 | 18 | |
| 19 | 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 20 | 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 21 | 21 | # |
| 22 | -# PREFIX = | |
| 22 | +PREFIX = | |
| 23 | 23 | # PREFIX = mingw32- |
| 24 | 24 | # PREFIX = i686-pc-mingw32- |
| 25 | -PREFIX = i686-w64-mingw32- | |
| 25 | +# PREFIX = i686-w64-mingw32- | |
| 26 | 26 | # PREFIX = x86_64-w64-mingw32- |
| 27 | 27 | |
| 28 | 28 | #### The toplevel directory of the source tree. Fossil can be built |
| 29 | 29 | # in a directory that is separate from the source tree. Just change |
| 30 | 30 | # the following to point from the build directory to the src/ folder. |
| @@ -63,15 +63,15 @@ | ||
| 63 | 63 | FOSSIL_ENABLE_SSL = 1 |
| 64 | 64 | |
| 65 | 65 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 66 | 66 | # issues when building incrementally). |
| 67 | 67 | # |
| 68 | -FOSSIL_BUILD_SSL = 1 | |
| 68 | +# FOSSIL_BUILD_SSL = 1 | |
| 69 | 69 | |
| 70 | 70 | #### Enable relative paths in external diff/gdiff |
| 71 | 71 | # |
| 72 | -FOSSIL_ENABLE_EXEC_REL_PATHS = 1 | |
| 72 | +# FOSSIL_ENABLE_EXEC_REL_PATHS = 1 | |
| 73 | 73 | |
| 74 | 74 | #### Enable legacy treatment of mv/rm (skip checkout files) |
| 75 | 75 | # |
| 76 | 76 | FOSSIL_ENABLE_LEGACY_MV_RM = 1 |
| 77 | 77 | |
| 78 | 78 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -17,14 +17,14 @@ | |
| 17 | # |
| 18 | |
| 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 21 | # |
| 22 | # PREFIX = |
| 23 | # PREFIX = mingw32- |
| 24 | # PREFIX = i686-pc-mingw32- |
| 25 | PREFIX = i686-w64-mingw32- |
| 26 | # PREFIX = x86_64-w64-mingw32- |
| 27 | |
| 28 | #### The toplevel directory of the source tree. Fossil can be built |
| 29 | # in a directory that is separate from the source tree. Just change |
| 30 | # the following to point from the build directory to the src/ folder. |
| @@ -63,15 +63,15 @@ | |
| 63 | FOSSIL_ENABLE_SSL = 1 |
| 64 | |
| 65 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 66 | # issues when building incrementally). |
| 67 | # |
| 68 | FOSSIL_BUILD_SSL = 1 |
| 69 | |
| 70 | #### Enable relative paths in external diff/gdiff |
| 71 | # |
| 72 | FOSSIL_ENABLE_EXEC_REL_PATHS = 1 |
| 73 | |
| 74 | #### Enable legacy treatment of mv/rm (skip checkout files) |
| 75 | # |
| 76 | FOSSIL_ENABLE_LEGACY_MV_RM = 1 |
| 77 | |
| 78 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -17,14 +17,14 @@ | |
| 17 | # |
| 18 | |
| 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 21 | # |
| 22 | PREFIX = |
| 23 | # PREFIX = mingw32- |
| 24 | # PREFIX = i686-pc-mingw32- |
| 25 | # PREFIX = i686-w64-mingw32- |
| 26 | # PREFIX = x86_64-w64-mingw32- |
| 27 | |
| 28 | #### The toplevel directory of the source tree. Fossil can be built |
| 29 | # in a directory that is separate from the source tree. Just change |
| 30 | # the following to point from the build directory to the src/ folder. |
| @@ -63,15 +63,15 @@ | |
| 63 | FOSSIL_ENABLE_SSL = 1 |
| 64 | |
| 65 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 66 | # issues when building incrementally). |
| 67 | # |
| 68 | # FOSSIL_BUILD_SSL = 1 |
| 69 | |
| 70 | #### Enable relative paths in external diff/gdiff |
| 71 | # |
| 72 | # FOSSIL_ENABLE_EXEC_REL_PATHS = 1 |
| 73 | |
| 74 | #### Enable legacy treatment of mv/rm (skip checkout files) |
| 75 | # |
| 76 | FOSSIL_ENABLE_LEGACY_MV_RM = 1 |
| 77 | |
| 78 |
+4
-4
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -17,14 +17,14 @@ | ||
| 17 | 17 | # |
| 18 | 18 | |
| 19 | 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 20 | 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 21 | 21 | # |
| 22 | -# PREFIX = | |
| 22 | +PREFIX = | |
| 23 | 23 | # PREFIX = mingw32- |
| 24 | 24 | # PREFIX = i686-pc-mingw32- |
| 25 | -PREFIX = i686-w64-mingw32- | |
| 25 | +# PREFIX = i686-w64-mingw32- | |
| 26 | 26 | # PREFIX = x86_64-w64-mingw32- |
| 27 | 27 | |
| 28 | 28 | #### The toplevel directory of the source tree. Fossil can be built |
| 29 | 29 | # in a directory that is separate from the source tree. Just change |
| 30 | 30 | # the following to point from the build directory to the src/ folder. |
| @@ -63,15 +63,15 @@ | ||
| 63 | 63 | FOSSIL_ENABLE_SSL = 1 |
| 64 | 64 | |
| 65 | 65 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 66 | 66 | # issues when building incrementally). |
| 67 | 67 | # |
| 68 | -FOSSIL_BUILD_SSL = 1 | |
| 68 | +# FOSSIL_BUILD_SSL = 1 | |
| 69 | 69 | |
| 70 | 70 | #### Enable relative paths in external diff/gdiff |
| 71 | 71 | # |
| 72 | -FOSSIL_ENABLE_EXEC_REL_PATHS = 1 | |
| 72 | +# FOSSIL_ENABLE_EXEC_REL_PATHS = 1 | |
| 73 | 73 | |
| 74 | 74 | #### Enable legacy treatment of mv/rm (skip checkout files) |
| 75 | 75 | # |
| 76 | 76 | FOSSIL_ENABLE_LEGACY_MV_RM = 1 |
| 77 | 77 | |
| 78 | 78 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -17,14 +17,14 @@ | |
| 17 | # |
| 18 | |
| 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 21 | # |
| 22 | # PREFIX = |
| 23 | # PREFIX = mingw32- |
| 24 | # PREFIX = i686-pc-mingw32- |
| 25 | PREFIX = i686-w64-mingw32- |
| 26 | # PREFIX = x86_64-w64-mingw32- |
| 27 | |
| 28 | #### The toplevel directory of the source tree. Fossil can be built |
| 29 | # in a directory that is separate from the source tree. Just change |
| 30 | # the following to point from the build directory to the src/ folder. |
| @@ -63,15 +63,15 @@ | |
| 63 | FOSSIL_ENABLE_SSL = 1 |
| 64 | |
| 65 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 66 | # issues when building incrementally). |
| 67 | # |
| 68 | FOSSIL_BUILD_SSL = 1 |
| 69 | |
| 70 | #### Enable relative paths in external diff/gdiff |
| 71 | # |
| 72 | FOSSIL_ENABLE_EXEC_REL_PATHS = 1 |
| 73 | |
| 74 | #### Enable legacy treatment of mv/rm (skip checkout files) |
| 75 | # |
| 76 | FOSSIL_ENABLE_LEGACY_MV_RM = 1 |
| 77 | |
| 78 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -17,14 +17,14 @@ | |
| 17 | # |
| 18 | |
| 19 | #### Select one of MinGW, MinGW-w64 (32-bit) or MinGW-w64 (64-bit) compilers. |
| 20 | # By default, this is an empty string (i.e. use the native compiler). |
| 21 | # |
| 22 | PREFIX = |
| 23 | # PREFIX = mingw32- |
| 24 | # PREFIX = i686-pc-mingw32- |
| 25 | # PREFIX = i686-w64-mingw32- |
| 26 | # PREFIX = x86_64-w64-mingw32- |
| 27 | |
| 28 | #### The toplevel directory of the source tree. Fossil can be built |
| 29 | # in a directory that is separate from the source tree. Just change |
| 30 | # the following to point from the build directory to the src/ folder. |
| @@ -63,15 +63,15 @@ | |
| 63 | FOSSIL_ENABLE_SSL = 1 |
| 64 | |
| 65 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 66 | # issues when building incrementally). |
| 67 | # |
| 68 | # FOSSIL_BUILD_SSL = 1 |
| 69 | |
| 70 | #### Enable relative paths in external diff/gdiff |
| 71 | # |
| 72 | # FOSSIL_ENABLE_EXEC_REL_PATHS = 1 |
| 73 | |
| 74 | #### Enable legacy treatment of mv/rm (skip checkout files) |
| 75 | # |
| 76 | FOSSIL_ENABLE_LEGACY_MV_RM = 1 |
| 77 | |
| 78 |