Bug 7711 - trunk/rules/active.list SVN confict in run_nightly
Summary: trunk/rules/active.list SVN confict in run_nightly
Status: RESOLVED FIXED
Alias: None
Product: Spamassassin
Classification: Unclassified
Component: Masses (show other bugs)
Version: SVN Trunk (Latest Devel Version)
Hardware: All All
: P2 normal
Target Milestone: Undefined
Assignee: Paul Stead
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2019-04-30 18:00 UTC by Paul Stead
Modified: 2019-04-30 18:00 UTC (History)
1 user (show)


Attachment Type Modified Status Actions Submitter/CLA Status
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Paul Stead 2019-04-30 18:00:10 UTC 
Apologies, meant to raise this prior to committing.


As per 

https://lists.apache.org/thread.html/743550d2f79a00d0113c04e0af8920a1c428735d2aabb765488e4f5d@%3Cruleqa.spamassassin.apache.org%3E

the following thread:

https://lists.apache.org/thread.html/e4723655cd8ed1101e5911b3d9ba8682b3f25c0ad52db4202ed72366@%3Csysadmins.spamassassin.apache.org%3E

Shows that the active.list file has a conflict within SVN that needs resolving. 

In an effort to resolve any conflicts going forwards, this commit accepts the working version as the resolution to the conflict, this should continue as intended and will only affect when there's a conflict that SVN can't handle itself.

----


Sending        build/mkupdates/run_nightly
Transmitting file data .done
Committing transaction...
Committed revision 1858449.
Comment 1 Paul Stead 2019-04-30 18:00:35 UTC 
Sending        build/mkupdates/run_nightly
Transmitting file data .done
Committing transaction...
Committed revision 1858449.