Fossil SCM
Fix the "fossil sync" command so that it works with options -u and --all at the same time.
Commit
95014ae9968180a704597a199927fad7310de8b4b4c4cb330c0be88a67b2cc88
Parent
d7008b34579d2f4…
1 file changed
+2
-2
+2
-2
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -2064,15 +2064,15 @@ | ||
| 2064 | 2064 | ** do not really need to be sent. |
| 2065 | 2065 | */ |
| 2066 | 2066 | if( (syncFlags & (SYNC_UNVERSIONED|SYNC_CLONE))!=0 ){ |
| 2067 | 2067 | unversioned_schema(); |
| 2068 | 2068 | db_multi_exec( |
| 2069 | - "CREATE TEMP TABLE uv_tosend(" | |
| 2069 | + "CREATE TEMP TABLE IF NOT EXISTS uv_tosend(" | |
| 2070 | 2070 | " name TEXT PRIMARY KEY," /* Name of file to send client->server */ |
| 2071 | 2071 | " mtimeOnly BOOLEAN" /* True to only send mtime, not content */ |
| 2072 | 2072 | ") WITHOUT ROWID;" |
| 2073 | - "INSERT INTO uv_toSend(name,mtimeOnly)" | |
| 2073 | + "REPLACE INTO uv_toSend(name,mtimeOnly)" | |
| 2074 | 2074 | " SELECT name, 0 FROM unversioned WHERE hash IS NOT NULL;" |
| 2075 | 2075 | ); |
| 2076 | 2076 | } |
| 2077 | 2077 | |
| 2078 | 2078 | /* |
| 2079 | 2079 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2064,15 +2064,15 @@ | |
| 2064 | ** do not really need to be sent. |
| 2065 | */ |
| 2066 | if( (syncFlags & (SYNC_UNVERSIONED|SYNC_CLONE))!=0 ){ |
| 2067 | unversioned_schema(); |
| 2068 | db_multi_exec( |
| 2069 | "CREATE TEMP TABLE uv_tosend(" |
| 2070 | " name TEXT PRIMARY KEY," /* Name of file to send client->server */ |
| 2071 | " mtimeOnly BOOLEAN" /* True to only send mtime, not content */ |
| 2072 | ") WITHOUT ROWID;" |
| 2073 | "INSERT INTO uv_toSend(name,mtimeOnly)" |
| 2074 | " SELECT name, 0 FROM unversioned WHERE hash IS NOT NULL;" |
| 2075 | ); |
| 2076 | } |
| 2077 | |
| 2078 | /* |
| 2079 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -2064,15 +2064,15 @@ | |
| 2064 | ** do not really need to be sent. |
| 2065 | */ |
| 2066 | if( (syncFlags & (SYNC_UNVERSIONED|SYNC_CLONE))!=0 ){ |
| 2067 | unversioned_schema(); |
| 2068 | db_multi_exec( |
| 2069 | "CREATE TEMP TABLE IF NOT EXISTS uv_tosend(" |
| 2070 | " name TEXT PRIMARY KEY," /* Name of file to send client->server */ |
| 2071 | " mtimeOnly BOOLEAN" /* True to only send mtime, not content */ |
| 2072 | ") WITHOUT ROWID;" |
| 2073 | "REPLACE INTO uv_toSend(name,mtimeOnly)" |
| 2074 | " SELECT name, 0 FROM unversioned WHERE hash IS NOT NULL;" |
| 2075 | ); |
| 2076 | } |
| 2077 | |
| 2078 | /* |
| 2079 |