The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit f4fe5a8fa0ff81dc01191d7085c743351c353369
Author: Pavel Sanda <[email protected]>
Date:   Thu Aug 16 20:12:49 2012 +0200

    Another attempt at #8295.
    
    This bug occur only at certain Qt versions and systems and we do
    not really understand what is going on.
    
    Quoting Stephan - the parent path of "." e.g. never should be ".".
    The inconsistency between the name of FileName and the internal QFileInfo
    state looks very dangerous.

diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 55a145c..719c3c2 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -100,12 +100,13 @@ bool VCS::makeRCSRevision(string const &version, string 
&revis) const
 
 bool VCS::checkparentdirs(FileName const & file, std::string const & pathname)
 {
-       FileName dirname = FileName(file.absFileName()).onlyPath();
+       FileName dirname = file.onlyPath();
        FileName tocheck = FileName(addName(dirname.absFileName(),pathname));
        LYXERR(Debug::LYXVC, "check file: " << tocheck.absFileName());
        bool result = tocheck.exists();
        while ( !result && !dirname.empty() ) {
-               dirname = dirname.parentPath();
+               //this construct because of #8295
+               dirname = FileName(dirname.absFileName()).parentPath();
                LYXERR(Debug::LYXVC, "check directory: " << 
dirname.absFileName());
                tocheck = FileName(addName(dirname.absFileName(),pathname));
                result = tocheck.exists();

-----------------------------------------------------------------------

Summary of changes:
 src/VCBackend.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to