Fossil SCM
Fix the "card count" on sync to include the configuration cards sent and received.
Commit
d53af79c81d3ccf76ae10b457ccbd9071c637373
Parent
92df4748bdba334…
1 file changed
+2
+2
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -841,10 +841,11 @@ | ||
| 841 | 841 | const char *zName; |
| 842 | 842 | zName = configure_first_name(configMask); |
| 843 | 843 | while( zName ){ |
| 844 | 844 | blob_appendf(&send, "reqconfig %s\n", zName); |
| 845 | 845 | zName = configure_next_name(configMask); |
| 846 | + nCard++; | |
| 846 | 847 | } |
| 847 | 848 | configMask = 0; |
| 848 | 849 | } |
| 849 | 850 | |
| 850 | 851 | /* Exchange messages with the server */ |
| @@ -969,10 +970,11 @@ | ||
| 969 | 970 | db_multi_exec( |
| 970 | 971 | "REPLACE INTO config(name,value) VALUES(%Q,%Q)", |
| 971 | 972 | zName, blob_str(&content) |
| 972 | 973 | ); |
| 973 | 974 | } |
| 975 | + nCard++; | |
| 974 | 976 | blob_reset(&content); |
| 975 | 977 | blob_seek(xfer.pIn, 1, BLOB_SEEK_CUR); |
| 976 | 978 | }else |
| 977 | 979 | |
| 978 | 980 | |
| 979 | 981 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -841,10 +841,11 @@ | |
| 841 | const char *zName; |
| 842 | zName = configure_first_name(configMask); |
| 843 | while( zName ){ |
| 844 | blob_appendf(&send, "reqconfig %s\n", zName); |
| 845 | zName = configure_next_name(configMask); |
| 846 | } |
| 847 | configMask = 0; |
| 848 | } |
| 849 | |
| 850 | /* Exchange messages with the server */ |
| @@ -969,10 +970,11 @@ | |
| 969 | db_multi_exec( |
| 970 | "REPLACE INTO config(name,value) VALUES(%Q,%Q)", |
| 971 | zName, blob_str(&content) |
| 972 | ); |
| 973 | } |
| 974 | blob_reset(&content); |
| 975 | blob_seek(xfer.pIn, 1, BLOB_SEEK_CUR); |
| 976 | }else |
| 977 | |
| 978 | |
| 979 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -841,10 +841,11 @@ | |
| 841 | const char *zName; |
| 842 | zName = configure_first_name(configMask); |
| 843 | while( zName ){ |
| 844 | blob_appendf(&send, "reqconfig %s\n", zName); |
| 845 | zName = configure_next_name(configMask); |
| 846 | nCard++; |
| 847 | } |
| 848 | configMask = 0; |
| 849 | } |
| 850 | |
| 851 | /* Exchange messages with the server */ |
| @@ -969,10 +970,11 @@ | |
| 970 | db_multi_exec( |
| 971 | "REPLACE INTO config(name,value) VALUES(%Q,%Q)", |
| 972 | zName, blob_str(&content) |
| 973 | ); |
| 974 | } |
| 975 | nCard++; |
| 976 | blob_reset(&content); |
| 977 | blob_seek(xfer.pIn, 1, BLOB_SEEK_CUR); |
| 978 | }else |
| 979 | |
| 980 | |
| 981 |