diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp index 390b3ce4e5..ea9536e86f 100644 --- a/src/VCBackend.cpp +++ b/src/VCBackend.cpp @@ -312,7 +312,7 @@ bool RCS::prepareFileRevision(string const &revis, string & f) } } - FileName tmpf = FileName::tempName("lyxvcrev"); + FileName tmpf = FileName::tempName("lyxvcrev_" + rev + "_"); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return N_("Error: Could not generate logfile."); @@ -1058,13 +1058,14 @@ bool SVN::prepareFileRevision(string const & revis, string & f) return false; } - FileName tmpf = FileName::tempName("lyxvcrev"); + string revname = convert(rev); + FileName tmpf = FileName::tempName("lyxvcrev_" + revname + "_"); if (tmpf.empty()) { LYXERR(Debug::LYXVC, "Could not generate logfile " << tmpf); return N_("Error: Could not generate logfile."); } - doVCCommand("svn cat -r " + convert(rev) + " " + doVCCommand("svn cat -r " + revname + " " + quoteName(onlyFileName(owner_->absFileName())) + " > " + quoteName(tmpf.toFilesystemEncoding()), FileName(owner_->filePath())); diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 860717bc39..39516872dd 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -2686,6 +2686,9 @@ void GuiView::dispatchVC(FuncRequest const & cmd) if (!buffer->lyxvc().prepareFileRevision(rev2, f2)) break; } + + LYXERR(Debug::LYXVC, "Launching comparison for fetched revisions: " << + f1 << "\n" << f2 << "\n" ); string par = "compare run " + f1 + " " + f2; lyx::dispatch(FuncRequest(LFUN_DIALOG_SHOW, par)); break;