Fossil SCM
Fix "fossil stash" so that it works with the undo enhancements.
Commit
3c0d8c267936e7162ea501308097f85c8111876b
Parent
b9b9d7e739c5769…
1 file changed
+2
-1
+2
-1
| --- src/undo.c | ||
| +++ src/undo.c | ||
| @@ -269,11 +269,12 @@ | ||
| 269 | 269 | ** Save the current content of the file zPathname so that it |
| 270 | 270 | ** will be undoable. The name is relative to the root of the |
| 271 | 271 | ** tree. |
| 272 | 272 | */ |
| 273 | 273 | void undo_save(const char *zPathname){ |
| 274 | - if( undo_maybe_save(zPathname, -1)!=UNDO_SAVED_OK ){ | |
| 274 | + int rc = undo_maybe_save(zPathname, -1); | |
| 275 | + if( rc!=UNDO_SAVED_OK && rc!=UNDO_INACTIVE ){ | |
| 275 | 276 | fossil_panic("failed to save undo information for path: %s", |
| 276 | 277 | zPathname); |
| 277 | 278 | } |
| 278 | 279 | } |
| 279 | 280 | |
| 280 | 281 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -269,11 +269,12 @@ | |
| 269 | ** Save the current content of the file zPathname so that it |
| 270 | ** will be undoable. The name is relative to the root of the |
| 271 | ** tree. |
| 272 | */ |
| 273 | void undo_save(const char *zPathname){ |
| 274 | if( undo_maybe_save(zPathname, -1)!=UNDO_SAVED_OK ){ |
| 275 | fossil_panic("failed to save undo information for path: %s", |
| 276 | zPathname); |
| 277 | } |
| 278 | } |
| 279 | |
| 280 |
| --- src/undo.c | |
| +++ src/undo.c | |
| @@ -269,11 +269,12 @@ | |
| 269 | ** Save the current content of the file zPathname so that it |
| 270 | ** will be undoable. The name is relative to the root of the |
| 271 | ** tree. |
| 272 | */ |
| 273 | void undo_save(const char *zPathname){ |
| 274 | int rc = undo_maybe_save(zPathname, -1); |
| 275 | if( rc!=UNDO_SAVED_OK && rc!=UNDO_INACTIVE ){ |
| 276 | fossil_panic("failed to save undo information for path: %s", |
| 277 | zPathname); |
| 278 | } |
| 279 | } |
| 280 | |
| 281 |