Do not overwrite read-only files. We now move the file to the backup directory and...

[lyx.git] / src / LyXVC.cpp

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index 922ecffe9fcd2001350a4c95d698584eaaacfa6c..ba7b02025528d2ad885ac00fc9de9ad408c9a29e 100644 (file)
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -165,7 +165,9 @@ string LyXVC::checkIn()
        docstring empty(_("(no log message)"));
        docstring response;
        string log;
-       bool ok = Alert::askForText(response, _("LyX VC: Log Message"));
+       bool ok = true;
+       if (vcs->isCheckInWithConfirmation())
+               ok = Alert::askForText(response, _("LyX VC: Log Message"));
        if (ok) {
                if (response.empty())
                        response = empty;
@@ -206,7 +208,7 @@ string LyXVC::lockingToggle()
 }
 
 
-void LyXVC::revert()
+bool LyXVC::revert()
 {
        LYXERR(Debug::LYXVC, "LyXVC: revert");
 
@@ -214,11 +216,12 @@ void LyXVC::revert()
        docstring text = bformat(_("Reverting to the stored version of the "
                                "document %1$s will lose all current changes.\n\n"
                                "Do you want to revert to the older version?"), file);
-       int const ret = Alert::prompt(_("Revert to stored version of document?"),
-               text, 0, 1, _("&Revert"), _("&Cancel"));
+       int ret = 0;
+       if (vcs->isRevertWithConfirmation())
+               ret = Alert::prompt(_("Revert to stored version of document?"),
+                       text, 0, 1, _("&Revert"), _("&Cancel"));
 
-       if (ret == 0)
-               vcs->revert();
+       return ret == 0 && vcs->revert();
 }