r65056 - /scripts/fill_svn_props

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri Nov 19 14:26:05 2010
New Revision: 65056

URL: http://svn.debian.org/wsvn/?sc=1&rev=65056
Log:
add propdel mergeWithUpstream

Modified:
    scripts/fill_svn_props

Modified: scripts/fill_svn_props
URL: http://svn.debian.org/wsvn/scripts/fill_svn_props?rev=65056&op=diff
==============================================================================
--- scripts/fill_svn_props (original)
+++ scripts/fill_svn_props Fri Nov 19 14:26:05 2010
@@ -12,7 +12,7 @@
 # * `fill_svn_props $pkgnameA $pkgnameB' to set them for some package(s)
 #
 # Copyright 2007-2008, Damyan Ivanov <dmn at debian.org>
-# Copyright 2008,      gregor herrmann <gregor+debian at comodo.priv.at>
+# Copyright 2008-2010, gregor herrmann <gregoa at debian.org>
 # License: to be decided :)
 
 set -eu
@@ -24,6 +24,7 @@
     svn ps svn-bp:upsCurrentUrl $SVN/branches/upstream/$1/current $1/debian
     svn ps svn-bp:upsTagUrl $SVN/branches/upstream/$1 $1/debian
     svn ps svn-bp:tagsUrl $SVN/tags/$1 $1/debian
+    svn pd mergeWithUpstream $1/debian || true
 }
 
 if [ "${1:-all}" != "all" ] ; then