[GME-commit] GMESRC/GME/XmlBackEnd CoreXmlFile.cpp,1.36,1.37

[Log messages of CVS commits]

Update of /project/gme-repository/GMESRC/GME/XmlBackEnd
In directory escher:/tmp/cvs-serv595

Modified Files:
	CoreXmlFile.cpp 
Log Message:
SVN:
Lock fails whenever 'lock' command is attempted on a file which was changed (first locked, changed and then commited) in the meantime by somebody else.

So the code is updated now, that whenever sign.txt is about to be locked:

'svn lock sign.txt'

a

'svn up sign.txt'

will precede it.
This will affect now only the sign.txt and protection file (list.txt) since the PublicStorage::acquireSVN method was changed only.



CVS User: Zoltan Molnar, ISIS (zolmol)

Index: CoreXmlFile.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/XmlBackEnd/CoreXmlFile.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** CoreXmlFile.cpp	9 May 2008 13:59:11 -0000	1.36
--- CoreXmlFile.cpp	13 May 2008 17:59:09 -0000	1.37
***************
*** 4700,4703 ****
--- 4700,4704 ----
  	if( FileHelp::isFileReadOnly( obj))
  	{
+ 		m_parent->updateSVN( obj); // SVN needs updating before any lock can be placed
  		m_parent->applyLockSVN( obj);
  		//ASSERT( !m_parent->isFileReadOnly( obj));