65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
-
-
-
-
-
-
-
|
vid = db_lget_int("checkout", 0);
if( vid==0 ){
fossil_fatal("cannot find current version");
}
if( db_exists("SELECT 1 FROM vmerge") ){
fossil_fatal("cannot update an uncommitted merge");
}
#if 0
/* Always do the update. If it does not work out, the user can back out
** the changes using "undo" */
if( !forceFlag && unsaved_changes() ){
fossil_fatal("uncommitted changes; use -f or --force to override");
}
#endif
|