[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    Re: Update_xml doesn't work
From:       Chusslove Illich <caslav.ilic () gmx ! net>
Date:       2012-06-30 14:06:49
Message-ID: 201206301606.52709.caslav.ilic () gmx ! net
[Download RAW message or body]

[Attachment #2 (multipart/mixed)]


> [: Marek Laane :]
> I tried radically another way, maybe now output is more informative for
> someone who does know scripts and svn and so on. So I rm -rf docs/kdepim
> and run once again (that patched version)

I forgot about this possibility (raw rm -rf) in previous patch, I've now
attached the updated patch for update_xml (revert update_xml to original
state before applying the new patch).

But, regardless of this...

> [: Marek Laane :]
> Not the thing I see, sadly ...

And what is it exactly that you see? Or, when you execute commands in the
order as I've listed them, at which one does it start looking different?

-- 
Chusslove Illich (Часлав Илић)

["update_xml-svn-1d7-compat-02.diff" (text/x-patch)]

Index: scripts/update_xml
===================================================================
--- scripts/update_xml	(revision 1303637)
+++ scripts/update_xml	(working copy)
@@ -153,12 +153,12 @@
         fi
 
 		# if missing, add base module dir to svn (<lang>/docs/<base module>)
-		if test ! -d $mbase/.svn; then
+		if ! svn info $mbase 1>/dev/null 2>/dev/null || test ! -d $mbase; then
 		   mkdir -p $mbase
-		   svn add --parents -N $mbase
+		   svn add --force --parents -N $mbase
 		fi
 		
-		if test ! -d $dir/.svn; then
+		if ! svn info $dir 1>/dev/null 2>/dev/null || test ! -d $dir; then
 			mkdir -p $dir
 			rm -f $trans_doc
 			mv temp.xml $trans_doc
@@ -167,7 +167,7 @@
 			  # For those who build in the same dir:
 			  echo *.cmake >> ignore.$$
 			  echo DartTextfile.txt >> ignore.$$
-			svn add $dir
+			svn add --force $dir
 			svn ps svn:ignore -F ignore.$$ $dir
 			rm ignore.$$
 		else
@@ -176,7 +176,7 @@
 				rm -f $trans_doc
 				mv temp.xml $trans_doc
 				if test "`svn status $trans_doc | cut -b-6`" = '?     ';  then
-					svn add $trans_doc 
+					svn add --force $trans_doc 
 				fi
 			else
 				rm temp.xml

["signature.asc" (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]