Fossil SCM

Abort the update if autosync fails.

andybradford 2014-05-05 07:26 UTC per-round-trip-commit
Commit 8478bfe27e7733053f324d8c21e0f6f635185277
1 file changed +3 -1
+3 -1
--- src/update.c
+++ src/update.c
@@ -127,11 +127,13 @@
127127
capture_case_sensitive_option();
128128
db_must_be_within_tree();
129129
vid = db_lget_int("checkout", 0);
130130
user_select();
131131
if( !dryRunFlag && !internalUpdate ){
132
- autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag);
132
+ if( autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag) ){
133
+ fossil_fatal("Autosync failed, cannot update");
134
+ }
133135
}
134136
135137
/* Create any empty directories now, as well as after the update,
136138
** so changes in settings are reflected now */
137139
if( !dryRunFlag ) ensure_empty_dirs_created();
138140
--- src/update.c
+++ src/update.c
@@ -127,11 +127,13 @@
127 capture_case_sensitive_option();
128 db_must_be_within_tree();
129 vid = db_lget_int("checkout", 0);
130 user_select();
131 if( !dryRunFlag && !internalUpdate ){
132 autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag);
 
 
133 }
134
135 /* Create any empty directories now, as well as after the update,
136 ** so changes in settings are reflected now */
137 if( !dryRunFlag ) ensure_empty_dirs_created();
138
--- src/update.c
+++ src/update.c
@@ -127,11 +127,13 @@
127 capture_case_sensitive_option();
128 db_must_be_within_tree();
129 vid = db_lget_int("checkout", 0);
130 user_select();
131 if( !dryRunFlag && !internalUpdate ){
132 if( autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag) ){
133 fossil_fatal("Autosync failed, cannot update");
134 }
135 }
136
137 /* Create any empty directories now, as well as after the update,
138 ** so changes in settings are reflected now */
139 if( !dryRunFlag ) ensure_empty_dirs_created();
140

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button