[Blends-commit] r2990 - /blends/trunk/webtools/blendstasktools.py

[tille at users.alioth.debian.org]

Author: tille
Date: Tue Oct 25 09:27:53 2011
New Revision: 2990

URL: http://svn.debian.org/wsvn/blends/?sc=1&rev=2990
Log:
When updateing a repository always prefer changes in far repository over own copy

Modified:
    blends/trunk/webtools/blendstasktools.py

Modified: blends/trunk/webtools/blendstasktools.py
URL: http://svn.debian.org/wsvn/blends/blends/trunk/webtools/blendstasktools.py?rev=2990&op=diff
==============================================================================
--- blends/trunk/webtools/blendstasktools.py (original)
+++ blends/trunk/webtools/blendstasktools.py Tue Oct 25 09:27:53 2011
@@ -496,7 +496,7 @@
         # Checkout/Update tasks from SVN
         svncommand = "svn %%s %s/%s/%s %s >> /dev/null" % (SVNHOST, data['vcsdir'], dir, tasksdir)
         if os.path.isdir(tasksdir+'/.svn'):
-    	    svncommand = svncommand % 'up'
+    	    svncommand = svncommand % ' --accept theirs-conflict up'
         else:
             os.system("mkdir -p %s" % (tasksdir))
             svncommand = svncommand % 'co'