On Wed, 15 Jul 2015, Sergei Gavrikov wrote:
> Hi,
>
> Fossil falls at dry run of merge for one my repository:
>
> % f merge -n trunk
> [snip]
> Fossil internal error: failed to save undo information for path: <garbage>
Below prevents 'fossil panic' for my case
Sergei
Index: src/undo.c
==================================================================
--- src/undo.c
+++ src/undo.c
@@ -269,11 +269,13 @@
** Save the current content of the file zPathname so that it
** will be undoable. The name is relative to the root of the
** tree.
*/
void undo_save(const char *zPathname){
- if( undo_maybe_save(zPathname, -1)!=UNDO_SAVED_OK ){
+ int rc;
+ rc = undo_maybe_save(zPathname, -1);
+ if( rc!=UNDO_SAVED_OK && rc!=UNDO_INACTIVE ){
fossil_panic("failed to save undo information for path: %s",
zPathname);
}
}
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
