You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spamassassin.apache.org by pd...@apache.org on 2019/04/30 17:54:36 UTC

svn commit: r1858449 - /spamassassin/trunk/build/mkupdates/run_nightly

Author: pds
Date: Tue Apr 30 17:54:36 2019
New Revision: 1858449

URL: http://svn.apache.org/viewvc?rev=1858449&view=rev
Log:
Resolve any conflicts with our working copy of the active.list

Modified:
    spamassassin/trunk/build/mkupdates/run_nightly

Modified: spamassassin/trunk/build/mkupdates/run_nightly
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/mkupdates/run_nightly?rev=1858449&r1=1858448&r2=1858449&view=diff
==============================================================================
--- spamassassin/trunk/build/mkupdates/run_nightly (original)
+++ spamassassin/trunk/build/mkupdates/run_nightly Tue Apr 30 17:54:36 2019
@@ -25,6 +25,8 @@ promote_active_rules() {
   cat $REPDIR/LATEST
 
   echo "Committing promotions in rules/active.list..."
+  # Accept any conflicts on the file with our working copy
+  svn resolve --accept working rules/active.list
   svn commit -m 'promotions validated' rules/active.list
 
   # create a list of "bad" rules in the current sandboxes, updated daily