anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Quickfix closing #6396.

Browse Source 
sleep sleep


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36154 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Pavel Sanda 2010-11-06 02:38:35 +00:00
parent 69520456e0
commit c9332413e5
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/VCBackend.cpp
View File

@ -213,7 +213,10 @@ bool RCS::isCheckInWithConfirmation()
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
if (tmpf.fileContents("UTF-8").empty())
docstring diff = tmpf.fileContents("UTF-8");
tmpf.erase();
if (diff.empty())
return false;
return true;
@ -1070,7 +1073,24 @@ bool SVN::checkInEnabled()
bool SVN::isCheckInWithConfirmation()
{
//FIXME diff
// FIXME one day common getDiff and perhaps OpMode for all backends
FileName tmpf = FileName::tempName("lyxvcout");
if (tmpf.empty()) {
LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf);
return true;
}
doVCCommandCall("svn diff " + quoteName(owner_->absFileName())
+ " > " + quoteName(tmpf.toFilesystemEncoding()),
FileName(owner_->filePath()));
docstring diff = tmpf.fileContents("UTF-8");
tmpf.erase();
if (diff.empty())
return false;
return true;
}