anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*VCBackend: Code simplification, constify, and adding an article.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32840 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Vincent van Ravesteijn 2010-01-07 17:02:02 +00:00
parent 2146ca143e
commit fc91b00bc8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/VCBackend.cpp
View File

@ -567,9 +567,8 @@ bool SVN::checkLockMode()
bool SVN::isLocked() const
{
//refresh file info
FileName file(file_.absFilename());
return !file.isReadOnly();
file_.refresh();
return !file_.isReadOnly();
}
@ -648,7 +647,7 @@ void SVN::fileLock(bool lock, FileName const & tmpf, string &status)
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()));
@ -693,7 +692,7 @@ string SVN::checkOut()
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);