[bedrock] Dev server cron is emailing errors

VERIFIED FIXED

Status

Infrastructure & Operations
WebOps: Other
--
minor
VERIFIED FIXED
5 years ago
4 years ago

People

(Reporter: pmac, Assigned: cturra)

Tracking

Details

An SVN conflict has cropped up and is causing www-dev to whine every 10 minutes. It says:

Conflict for property 'svn:externals' discovered on '/data/bedrock-dev/src/www-dev.allizom.org'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (s) show all options: svn: E070014: Couldn't do property merge
svn: E070014: Can't read stdin: End of file found

I do know that the svn:externals property was recently edited to remove tabzilla, but I've no idea why it's causing this error. Any help you might give would be appreciated.
(Assignee)

Comment 1

5 years ago
i have manually sorted this svn conflict.

[root@bedrockadm.private.phx1 www-dev.allizom.org]# export SVN_EDITOR=vim; svn up
Updating '.':
Conflict for property 'svn:externals' discovered on '/data/bedrock-dev/src/www-dev.allizom.org'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (s) show all options: df
--- /data/bedrock-dev/src/svn-pc94t9	Wed Jun 12 10:46:16 2013
+++ /tmp/svn-CGIp5Z	Wed Jun 12 10:46:16 2013
@@ -1 +1,5 @@
-tabzilla https://github.com/mozilla/tabzilla/branches/master
+<<<<<<< (modified)
+tabzilla https://github.com/mozilla/tabzilla/trunk
+=======
+
+>>>>>>> (latest)
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (s) show all options: df
--- /data/bedrock-dev/src/svn-pc94t9	Wed Jun 12 10:46:16 2013
+++ /tmp/svn-CGIp5Z	Wed Jun 12 10:46:33 2013
@@ -1 +0,0 @@
-tabzilla https://github.com/mozilla/tabzilla/branches/master
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (s) show all options: r
 U   .

Fetching external item into 'tests/product-details':
U    tests/product-details/history/mobileHistory.class.php
U    tests/product-details/history/firefoxHistory.class.php
U    tests/product-details/firefoxDetails.class.php
U    tests/product-details/mobileDetails.class.php
U    tests/product-details/json/firefox_primary_builds.json
U    tests/product-details/json/firefox_history_development_releases.json
U    tests/product-details/json/mobile_details.json
U    tests/product-details/json/mobile_history_development_releases.json
U    tests/product-details/json/firefox_versions.json
U    tests/product-details/json/firefox_beta_builds.json
Updated external to revision 116894.


Fetching external item into 'en-US/firefox/fb-badges/locale':
External at revision 116894.


Fetching external item into 'includes/product-details':
U    includes/product-details/history/mobileHistory.class.php
U    includes/product-details/history/firefoxHistory.class.php
U    includes/product-details/firefoxDetails.class.php
U    includes/product-details/mobileDetails.class.php
U    includes/product-details/json/firefox_primary_builds.json
U    includes/product-details/json/firefox_history_development_releases.json
U    includes/product-details/json/mobile_details.json
U    includes/product-details/json/mobile_history_development_releases.json
U    includes/product-details/json/firefox_versions.json
U    includes/product-details/json/firefox_beta_builds.json
Updated external to revision 116894.


Fetching external item into 'includes/certs':
External at revision 116894.


Fetching external item into 'en-US/firefox/webhero/fb/locale':
External at revision 116894.


Fetching external item into 'img/screenshots':
External at revision 116894.

Removed external 'tabzilla'
Updated to revision 116894.
Assignee: server-ops-webops → cturra
Status: NEW → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
Confirmed. Emails have ceased. Thanks ever so much!
Status: RESOLVED → VERIFIED
Component: Server Operations: Web Operations → WebOps: Other
Product: mozilla.org → Infrastructure & Operations
You need to log in before you can comment on or make changes to this bug.