Fossil SCM
Merge in the latest changes from venks-emacs.
Commit
7d2d1d3228232b1a1434e425f11008c043171263
Parent
21880ca1b67d727…
1 file changed
+2
-2
+2
-2
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -71,11 +71,11 @@ | ||
| 71 | 71 | db_must_be_within_tree(); |
| 72 | 72 | vid = db_lget_int("checkout", 0); |
| 73 | 73 | if( vid==0 ){ |
| 74 | 74 | fossil_fatal("cannot find current version"); |
| 75 | 75 | } |
| 76 | - if( db_exists("SELECT 1 FROM vmerge") ){ | |
| 76 | + if( !nochangeFlag && db_exists("SELECT 1 FROM vmerge") ){ | |
| 77 | 77 | fossil_fatal("cannot update an uncommitted merge"); |
| 78 | 78 | } |
| 79 | 79 | if( !nochangeFlag ) autosync(AUTOSYNC_PULL); |
| 80 | 80 | |
| 81 | 81 | if( g.argc>=3 ){ |
| @@ -183,11 +183,11 @@ | ||
| 183 | 183 | blob_append(&sql, "DELETE FROM fv WHERE ", -1); |
| 184 | 184 | zSep = ""; |
| 185 | 185 | for(i=3; i<g.argc; i++){ |
| 186 | 186 | file_tree_name(g.argv[i], &treename, 1); |
| 187 | 187 | if( file_isdir(g.argv[i])==1 ){ |
| 188 | - if( blob_size(&treename)>0 ){ | |
| 188 | + if( blob_size(&treename) != 1 || blob_str(&treename)[0] != '.' ){ | |
| 189 | 189 | blob_appendf(&sql, "%sfn NOT GLOB '%b/*' ", zSep, &treename); |
| 190 | 190 | }else{ |
| 191 | 191 | blob_reset(&sql); |
| 192 | 192 | break; |
| 193 | 193 | } |
| 194 | 194 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -71,11 +71,11 @@ | |
| 71 | db_must_be_within_tree(); |
| 72 | vid = db_lget_int("checkout", 0); |
| 73 | if( vid==0 ){ |
| 74 | fossil_fatal("cannot find current version"); |
| 75 | } |
| 76 | if( db_exists("SELECT 1 FROM vmerge") ){ |
| 77 | fossil_fatal("cannot update an uncommitted merge"); |
| 78 | } |
| 79 | if( !nochangeFlag ) autosync(AUTOSYNC_PULL); |
| 80 | |
| 81 | if( g.argc>=3 ){ |
| @@ -183,11 +183,11 @@ | |
| 183 | blob_append(&sql, "DELETE FROM fv WHERE ", -1); |
| 184 | zSep = ""; |
| 185 | for(i=3; i<g.argc; i++){ |
| 186 | file_tree_name(g.argv[i], &treename, 1); |
| 187 | if( file_isdir(g.argv[i])==1 ){ |
| 188 | if( blob_size(&treename)>0 ){ |
| 189 | blob_appendf(&sql, "%sfn NOT GLOB '%b/*' ", zSep, &treename); |
| 190 | }else{ |
| 191 | blob_reset(&sql); |
| 192 | break; |
| 193 | } |
| 194 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -71,11 +71,11 @@ | |
| 71 | db_must_be_within_tree(); |
| 72 | vid = db_lget_int("checkout", 0); |
| 73 | if( vid==0 ){ |
| 74 | fossil_fatal("cannot find current version"); |
| 75 | } |
| 76 | if( !nochangeFlag && db_exists("SELECT 1 FROM vmerge") ){ |
| 77 | fossil_fatal("cannot update an uncommitted merge"); |
| 78 | } |
| 79 | if( !nochangeFlag ) autosync(AUTOSYNC_PULL); |
| 80 | |
| 81 | if( g.argc>=3 ){ |
| @@ -183,11 +183,11 @@ | |
| 183 | blob_append(&sql, "DELETE FROM fv WHERE ", -1); |
| 184 | zSep = ""; |
| 185 | for(i=3; i<g.argc; i++){ |
| 186 | file_tree_name(g.argv[i], &treename, 1); |
| 187 | if( file_isdir(g.argv[i])==1 ){ |
| 188 | if( blob_size(&treename) != 1 || blob_str(&treename)[0] != '.' ){ |
| 189 | blob_appendf(&sql, "%sfn NOT GLOB '%b/*' ", zSep, &treename); |
| 190 | }else{ |
| 191 | blob_reset(&sql); |
| 192 | break; |
| 193 | } |
| 194 |