Fossil SCM

Continue with the update routine even if the targetted version equals the current checkout version instead of depending on the value of the verbose flag to continue or not. This fixes tkt [e8a10100e2]. Fossil update will now recover lost files with or without the -v flag.

phaeton 2011-08-22 15:55 trunk
Commit c6b371c46ca0e53e2eff84ffdaee384e7f8216cc
1 file changed -1
--- src/update.c
+++ src/update.c
@@ -185,11 +185,10 @@
185185
186186
if( tid==0 ){
187187
fossil_panic("Internal Error: unable to find a version to update to.");
188188
}
189189
190
- if( tid==vid && !verboseFlag ) return; /* Nothing to update */
191190
db_begin_transaction();
192191
vfile_check_signature(vid, 1, 0);
193192
if( !nochangeFlag && !internalUpdate ) undo_begin();
194193
load_vfile_from_rid(tid);
195194
196195
--- src/update.c
+++ src/update.c
@@ -185,11 +185,10 @@
185
186 if( tid==0 ){
187 fossil_panic("Internal Error: unable to find a version to update to.");
188 }
189
190 if( tid==vid && !verboseFlag ) return; /* Nothing to update */
191 db_begin_transaction();
192 vfile_check_signature(vid, 1, 0);
193 if( !nochangeFlag && !internalUpdate ) undo_begin();
194 load_vfile_from_rid(tid);
195
196
--- src/update.c
+++ src/update.c
@@ -185,11 +185,10 @@
185
186 if( tid==0 ){
187 fossil_panic("Internal Error: unable to find a version to update to.");
188 }
189
 
190 db_begin_transaction();
191 vfile_check_signature(vid, 1, 0);
192 if( !nochangeFlag && !internalUpdate ) undo_begin();
193 load_vfile_from_rid(tid);
194
195

Keyboard Shortcuts

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