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

Rebase not working for simple setup

XMLWordPrintable

    • 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.

      Hi,

      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

java.lang.NullPointerException
	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?

      Thanks,
      Chris

          [JENKINS-23107] Rebase not working for simple setup

          Hugues Chabot added a comment -

          Can you confirm if the bug persist after the project is build for the first time?

          I suspect this happens because the workspace did not exists. There is a pull request regarding this.

          Hugues Chabot added a comment - Can you confirm if the bug persist after the project is build for the first time? I suspect this happens because the workspace did not exists. There is a pull request regarding this.

          Chris Platts added a comment -

          Ah, excellent – that seems to have fixed the problem!

          Should I resolve this issue or would you like it kept open and perhaps linked to the pull request?

          Regards,
          Chris

          Chris Platts added a comment - Ah, excellent – that seems to have fixed the problem! Should I resolve this issue or would you like it kept open and perhaps linked to the pull request? Regards, Chris

          Hugues Chabot added a comment -

          Thank you.

          Let's keep the issue open until the pull request is merged.

          Hugues Chabot added a comment - Thank you. Let's keep the issue open until the pull request is merged.

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Hugues Chabot
          Path:
          src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java
          src/main/resources/jenkins/plugins/svnmerge/IntegrationStatusAction/index.groovy
          http://jenkins-ci.org/commit/svnmerge-plugin/08df4c85d54def91da3edc39be7fce2912b8bb8f
          Log:
          [FIXED JENKINS-23107] Check to ensure that there is a build with a workspace available

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Hugues Chabot Path: src/main/java/jenkins/plugins/svnmerge/FeatureBranchProperty.java src/main/resources/jenkins/plugins/svnmerge/IntegrationStatusAction/index.groovy http://jenkins-ci.org/commit/svnmerge-plugin/08df4c85d54def91da3edc39be7fce2912b8bb8f Log: [FIXED JENKINS-23107] Check to ensure that there is a build with a workspace available

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

              Created:
              Updated:
              Resolved: