[LyX/master] Allow registration of files with svn when parents directory is not yet registered.

Richard Kimberly Heck rikiheck at lyx.org
Fri Dec 18 20:31:40 UTC 2020


commit 77cdef1fe0ca069c916e0f824c1b7ff98f771748
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Fri Dec 18 16:01:43 2020 -0500

    Allow registration of files with svn when parents directory is not yet registered.
---
 src/LyXVC.cpp     |    2 --
 src/VCBackend.cpp |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/src/LyXVC.cpp b/src/LyXVC.cpp
index b18bcdf..8d0255f 100644
--- a/src/LyXVC.cpp
+++ b/src/LyXVC.cpp
@@ -198,8 +198,6 @@ bool LyXVC::registrer()
 	}
 	if (response.empty())
 		response = _("(no initial description)");
-	// FIXME This will fail with svn if the current directory has not
-	// itself been added.
 	vcs_->registrer(to_utf8(response));
 	return true;
 }
diff --git a/src/VCBackend.cpp b/src/VCBackend.cpp
index 680af81..d242a21 100644
--- a/src/VCBackend.cpp
+++ b/src/VCBackend.cpp
@@ -1251,7 +1251,7 @@ bool SVN::retrieve(FileName const & file)
 
 void SVN::registrer(string const & /*msg*/)
 {
-	doVCCommand("svn add -q " + quoteName(onlyFileName(owner_->absFileName())),
+	doVCCommand("svn add -q --parents " + quoteName(onlyFileName(owner_->absFileName())),
 		    FileName(owner_->filePath()));
 }
 


More information about the lyx-cvs mailing list