Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-23107

Rebase not working for simple setup


    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Major Major
    • svnmerge-plugin
    • None
    • Windows jenkins host, Linux slave for builds. Jenkins v1.509.2, svnmerge plugin v2.1, subversion plugin v2.4.


      I've just installed the svnmerge plugin to take the pain out of branching and creating matching projects. It looks ideal!

      So, I've clicked one of my software build jobs and enabled svnmerge in its config. I've created a branch via the svnmerge options and it's correctly created the branch in svn and the job to build it in Jenkins.

      I've since made changes on the trunk and want to rebase the branch (which is as of now still unmodified after branching).

      I've clicked the Rebase option on the branch job and chosen Latest Revision.

      Unfortunately this fails with the following message.

      Rebasing is in progress
      	at jenkins.plugins.svnmerge.FeatureBranchProperty.rebase(FeatureBranchProperty.java:159)
      	at jenkins.plugins.svnmerge.RebaseAction.perform(RebaseAction.java:105)
      	at jenkins.plugins.svnmerge.RebaseAction.perform(RebaseAction.java:25)
      	at jenkins.plugins.svnmerge.AbstractSvnmergeTaskAction$WorkerThread.perform(AbstractSvnmergeTaskAction.java:105)
      	at hudson.model.TaskThread.run(TaskThread.java:127)
      	at jenkins.plugins.svnmerge.AbstractSvnmergeTaskAction$TaskImpl$1.run(AbstractSvnmergeTaskAction.java:161)
      	at hudson.model.ResourceController.execute(ResourceController.java:88)
      	at hudson.model.Executor.run(Executor.java:237)

      I don't want to play with the plugin any further until I get the basics working – any ideas?


            hugueschabot Hugues Chabot
            displaced Chris Platts
            0 Vote for this issue
            3 Start watching this issue