Fossil SCM
If at the tip of the current branch but there are children in other branches, the "fossil up" command should do nothing.
Commit
1343cfad7bd4a27f76322ac7f466e43af2898f8d
Parent
88e9f24affa25e3…
1 file changed
+1
+1
| --- src/update.c | ||
| +++ src/update.c | ||
| @@ -175,10 +175,11 @@ | ||
| 175 | 175 | } |
| 176 | 176 | } |
| 177 | 177 | tid = db_int(0, "SELECT rid FROM leaves, event" |
| 178 | 178 | " WHERE event.objid=leaves.rid" |
| 179 | 179 | " ORDER BY event.mtime DESC"); |
| 180 | + if( tid==0 ) tid = vid; | |
| 180 | 181 | } |
| 181 | 182 | |
| 182 | 183 | if( tid==0 ){ |
| 183 | 184 | fossil_panic("Internal Error: unable to find a version to update to."); |
| 184 | 185 | } |
| 185 | 186 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -175,10 +175,11 @@ | |
| 175 | } |
| 176 | } |
| 177 | tid = db_int(0, "SELECT rid FROM leaves, event" |
| 178 | " WHERE event.objid=leaves.rid" |
| 179 | " ORDER BY event.mtime DESC"); |
| 180 | } |
| 181 | |
| 182 | if( tid==0 ){ |
| 183 | fossil_panic("Internal Error: unable to find a version to update to."); |
| 184 | } |
| 185 |
| --- src/update.c | |
| +++ src/update.c | |
| @@ -175,10 +175,11 @@ | |
| 175 | } |
| 176 | } |
| 177 | tid = db_int(0, "SELECT rid FROM leaves, event" |
| 178 | " WHERE event.objid=leaves.rid" |
| 179 | " ORDER BY event.mtime DESC"); |
| 180 | if( tid==0 ) tid = vid; |
| 181 | } |
| 182 | |
| 183 | if( tid==0 ){ |
| 184 | fossil_panic("Internal Error: unable to find a version to update to."); |
| 185 | } |
| 186 |