Fossil SCM
Alway run autosync prior to an "update" even when specifying a specific check-in to update to.
Commit
f57990b65abcacd7b7fb0465ae36dc8b92122267
Parent
980b160bd07a746…
1 file changed
+1
-10
+1
-10
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -78,20 +78,11 @@ | ||
| 78 | 78 | } |
| 79 | 79 | if( !is_a_version(tid) ){ |
| 80 | 80 | fossil_fatal("not a version: %s", g.argv[2]); |
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | - | |
| 84 | - if( tid==0 ){ | |
| 85 | - /* | |
| 86 | - ** Do an autosync pull prior to the update, if autosync is on and they | |
| 87 | - ** did not want a specific version (i.e. another branch, a past revision). | |
| 88 | - ** By not giving a specific version, they are asking for the latest, thus | |
| 89 | - ** pull to get the latest, then update. | |
| 90 | - */ | |
| 91 | - autosync(AUTOSYNC_PULL); | |
| 92 | - } | |
| 83 | + autosync(AUTOSYNC_PULL); | |
| 93 | 84 | |
| 94 | 85 | if( tid==0 ){ |
| 95 | 86 | compute_leaves(vid, 1); |
| 96 | 87 | if( !latestFlag && db_int(0, "SELECT count(*) FROM leaves")>1 ){ |
| 97 | 88 | db_prepare(&q, |
| 98 | 89 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -78,20 +78,11 @@ | |
| 78 | } |
| 79 | if( !is_a_version(tid) ){ |
| 80 | fossil_fatal("not a version: %s", g.argv[2]); |
| 81 | } |
| 82 | } |
| 83 | |
| 84 | if( tid==0 ){ |
| 85 | /* |
| 86 | ** Do an autosync pull prior to the update, if autosync is on and they |
| 87 | ** did not want a specific version (i.e. another branch, a past revision). |
| 88 | ** By not giving a specific version, they are asking for the latest, thus |
| 89 | ** pull to get the latest, then update. |
| 90 | */ |
| 91 | autosync(AUTOSYNC_PULL); |
| 92 | } |
| 93 | |
| 94 | if( tid==0 ){ |
| 95 | compute_leaves(vid, 1); |
| 96 | if( !latestFlag && db_int(0, "SELECT count(*) FROM leaves")>1 ){ |
| 97 | db_prepare(&q, |
| 98 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -78,20 +78,11 @@ | |
| 78 | } |
| 79 | if( !is_a_version(tid) ){ |
| 80 | fossil_fatal("not a version: %s", g.argv[2]); |
| 81 | } |
| 82 | } |
| 83 | autosync(AUTOSYNC_PULL); |
| 84 | |
| 85 | if( tid==0 ){ |
| 86 | compute_leaves(vid, 1); |
| 87 | if( !latestFlag && db_int(0, "SELECT count(*) FROM leaves")>1 ){ |
| 88 | db_prepare(&q, |
| 89 |