Fossil SCM

Make error message less redundant.

andybradford 2014-05-07 04:00 UTC per-round-trip-commit
Commit d02f144d708e89299ae28a2b99eeb829a6799c5f
1 file changed +1 -1
+1 -1
--- src/update.c
+++ src/update.c
@@ -128,11 +128,11 @@
128128
db_must_be_within_tree();
129129
vid = db_lget_int("checkout", 0);
130130
user_select();
131131
if( !dryRunFlag && !internalUpdate ){
132132
if( autosync(SYNC_PULL + SYNC_VERBOSE*verboseFlag) ){
133
- fossil_fatal("Autosync failed, cannot update");
133
+ fossil_fatal("Cannot proceed with update");
134134
}
135135
}
136136
137137
/* Create any empty directories now, as well as after the update,
138138
** so changes in settings are reflected now */
139139
--- src/update.c
+++ src/update.c
@@ -128,11 +128,11 @@
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
--- src/update.c
+++ src/update.c
@@ -128,11 +128,11 @@
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("Cannot proceed with 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

Keyboard Shortcuts

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