bool SVN::isLocked() const
{
- //refresh file info
- FileName file(file_.absFilename());
- return !file.isReadOnly();
+ file_.refresh();
+ return !file_.isReadOnly();
}
if (!locked_mode_ || (isLocked() == lock))
return;
- string arg = lock ? "lock " : "unlock ";
+ string const arg = lock ? "lock " : "unlock ";
doVCCommand("svn "+ arg + quoteName(onlyFilename(owner_->absFileName()))
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
frontend::Alert::error(_("Revision control error."),
bformat(_("Error when updating from repository.\n"
"You have to manually resolve the conflicts NOW!\n'%1$s'.\n\n"
- "After pressing OK, LyX will try to reopen resolved document."),
+ "After pressing OK, LyX will try to reopen the resolved document."),
from_local8bit(res)));
fileLock(true, tmpf, log);