www-infrastructure-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "David Blevins (JIRA)" <j...@apache.org>
Subject [jira] [Created] (INFRA-7387) TomEE staging cms in conflict
Date Thu, 27 Feb 2014 04:56:20 GMT
David Blevins created INFRA-7387:
------------------------------------

             Summary: TomEE staging cms in conflict
                 Key: INFRA-7387
                 URL: https://issues.apache.org/jira/browse/INFRA-7387
             Project: Infrastructure
          Issue Type: Bug
          Components: CMS
            Reporter: David Blevins


Looks like we need a bit of manual intervention.


http://ci.apache.org/builders/tomee-site-staging/builds/193/steps/shell/logs/stdio

svn ci --username=buildbot /usr/local/websites/tomee/trunk -m 'Staging update by buildbot
for tomee'
 in dir /home/cmsslave/slave15/tomee-site-staging/build (timeout 1200 secs)
 watching logfiles {}
 argv: ['svn', 'ci', '--username=buildbot', '/usr/local/websites/tomee/trunk', '-m', 'Staging
update by buildbot for tomee']
 environment:
  BLOCKSIZE=K
  EDITOR=vi
  ENV=/home/cmsslave/.shrc
  HOME=/home/cmsslave
  LANG=en_US.UTF-8
  MAIL=/var/mail/cmsslave
  PACKAGESITE=ftp://tb.apache.org/pub/FreeBSD/ports/packages/9.1-RELENG-s-cms/Latest/
  PAGER=more
  PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/home/cmsslave/bin
  PWD=/home/cmsslave/slave15/tomee-site-staging/build
  SHELL=/bin/bash
  SHLVL=1
  USER=cmsslave
  _=/usr/local/bin/buildslave
 using PTY: False
svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/usr/local/websites/tomee/trunk/content/dev/jira/patches.html'
remains in conflict
program finished with exit code 1
elapsedTime=0.156282



--
This message was sent by Atlassian JIRA
(v6.1.5#6160)

Mime
View raw message