[JIRA] [svnmerge] (JENKINS-12495) svnmerge fails when running on a Jenkins slave

[hugues.cha...@gmail.com (JIRA)]

Hugues Chabot commented on JENKINS-12495 svnmerge fails when running on a Jenkins slave Where I work, we neither use slaves nor automatic reintegration. I setup a simple ssh-slave in other to test the plugin but I used de svn protocol. So, I guess I will have to setup a webdav interface in order to reproduce this issue. Here is how one could manually integrate a feature branch like svnmerge. Check if there is something to integrate with svn log If there is something to integrate, switch to upstream with svn switch upstream_url Reintegrate the branch with svn merge --reintegrate branch_url . If there are conflicts abort, otherwise svn commit and note the revision number as REV Switch back to the feature branch with svn switch branch_url Record the integration in the feature branch to avoid rebasing it whit svn merge --record-only --change REV upstream_url . and svn commit The last part is from https://wiki.apache.org/subversion/KeepingReintegratedBranchAlive.

This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators. For more information on JIRA, see: http://www.atlassian.com/software/jira

--
You received this message because you are subscribed to the Google Groups "Jenkins Issues" group.
To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-issues+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.