infra-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Gavin (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (INFRA-16820) www-site-staging borked; SVN conflict
Date Thu, 26 Jul 2018 11:18:00 GMT

    [ https://issues.apache.org/jira/browse/INFRA-16820?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16558196#comment-16558196
] 

Gavin commented on INFRA-16820:
-------------------------------

removed conflicts (several) and published a new wc.

Its should be fine to try again.

> www-site-staging borked; SVN conflict
> -------------------------------------
>
>                 Key: INFRA-16820
>                 URL: https://issues.apache.org/jira/browse/INFRA-16820
>             Project: Infrastructure
>          Issue Type: Bug
>          Components: SvnPubSub
>         Environment: https://ci.apache.org/builders/www-site-staging
>            Reporter: Sebb
>            Assignee: Gavin
>            Priority: Major
>
> $ svn ci --username=buildbot /usr/local/websites/www/trunk -m 'Staging update by buildbot
for www'
> svn: E155015: Commit failed (details follow):
> svn: E155015: Aborting commit: '/usr/local/websites/www/trunk/content/dev/index.html'
remains in conflict



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message