Fossil SCM
Automatically pull before running the "fossil merge" command, in case there have been new check-ins to the branch being merged.
Commit
16501a04a726bb1d8d46820e2b67cf6e53785ea7
Parent
a6b999ce131c0f1…
1 file changed
+6
+6
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -226,10 +226,16 @@ | ||
| 226 | 226 | db_must_be_within_tree(); |
| 227 | 227 | if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0); |
| 228 | 228 | vid = db_lget_int("checkout", 0); |
| 229 | 229 | if( vid==0 ){ |
| 230 | 230 | fossil_fatal("nothing is checked out"); |
| 231 | + } | |
| 232 | + if( !dryRunFlag ){ | |
| 233 | + if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag, | |
| 234 | + db_get_int("autosync-tries", 1)) ){ | |
| 235 | + fossil_fatal("Cannot proceed with merge"); | |
| 236 | + } | |
| 231 | 237 | } |
| 232 | 238 | |
| 233 | 239 | /* Find mid, the artifactID of the version to be merged into the current |
| 234 | 240 | ** check-out */ |
| 235 | 241 | if( g.argc==3 ){ |
| 236 | 242 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -226,10 +226,16 @@ | |
| 226 | db_must_be_within_tree(); |
| 227 | if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0); |
| 228 | vid = db_lget_int("checkout", 0); |
| 229 | if( vid==0 ){ |
| 230 | fossil_fatal("nothing is checked out"); |
| 231 | } |
| 232 | |
| 233 | /* Find mid, the artifactID of the version to be merged into the current |
| 234 | ** check-out */ |
| 235 | if( g.argc==3 ){ |
| 236 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -226,10 +226,16 @@ | |
| 226 | db_must_be_within_tree(); |
| 227 | if( zBinGlob==0 ) zBinGlob = db_get("binary-glob",0); |
| 228 | vid = db_lget_int("checkout", 0); |
| 229 | if( vid==0 ){ |
| 230 | fossil_fatal("nothing is checked out"); |
| 231 | } |
| 232 | if( !dryRunFlag ){ |
| 233 | if( autosync_loop(SYNC_PULL + SYNC_VERBOSE*verboseFlag, |
| 234 | db_get_int("autosync-tries", 1)) ){ |
| 235 | fossil_fatal("Cannot proceed with merge"); |
| 236 | } |
| 237 | } |
| 238 | |
| 239 | /* Find mid, the artifactID of the version to be merged into the current |
| 240 | ** check-out */ |
| 241 | if( g.argc==3 ){ |
| 242 |