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

Manually-triggered integration

XMLWordPrintable

    • Icon: New Feature New Feature
    • Resolution: Fixed
    • Icon: Minor Minor
    • svnmerge-plugin
    • None

      Hi,

      Perhaps this is already available, but I just can't find it!

      Is there a way to trigger a manual reintegration of a branch job to its parent?

      I understand that there's the post-build action that can be added to do this automatically after each build of the branch, but I'd prefer to only reintegrate once we've decided to do so.

      I tried reintegrating the branch as normal via my SVN client, thinking that perhaps the plugin would magically pick that up, but no joy.

          [JENKINS-23371] Manually-triggered integration

          Chris Platts created issue -

          Hugues Chabot added a comment -

          The manual reintegration action is at the level of the build (not the project).

          In your project, select a build and then "Integrate branch".

          Hugues Chabot added a comment - The manual reintegration action is at the level of the build (not the project). In your project, select a build and then "Integrate branch".
          Hugues Chabot made changes -
          Assignee Original: Kohsuke Kawaguchi [ kohsuke ] New: Hugues Chabot [ hugueschabot ]
          Resolution New: Not A Defect [ 7 ]
          Status Original: Open [ 1 ] New: Resolved [ 5 ]

          Chris Platts added a comment -

          Hi,

          Thanks for that. Strangely, the 'Integrate Branch' option was visible on one of my branches, but another doesn't show it at all.

          I double checked that it was correctly identified as a feature branch (it is). However, in the individual build page, there is no Integrate Branch option.

          Are there criteria which must be met for the build to be able to be integrated (other than the build succeeding and it having been rebased from trunk so upstream changes are merged in)

          Chris Platts added a comment - Hi, Thanks for that. Strangely, the 'Integrate Branch' option was visible on one of my branches, but another doesn't show it at all. I double checked that it was correctly identified as a feature branch (it is). However, in the individual build page, there is no Integrate Branch option. Are there criteria which must be met for the build to be able to be integrated (other than the build succeeding and it having been rebased from trunk so upstream changes are merged in)

          Chris Platts added a comment -

          Reopening because the option to reintegrate isn't showing on a project and can't tell why

          Chris Platts added a comment - Reopening because the option to reintegrate isn't showing on a project and can't tell why
          Chris Platts made changes -
          Resolution Original: Not A Defect [ 7 ]
          Status Original: Resolved [ 5 ] New: Reopened [ 4 ]

          Hugues Chabot added a comment -

          The Integrate Branch action will be available if (and only if) the build if from a Feature Branch project that has only one Subversion module.

          Can you check if the builds that are not re-integrable have more than one Subversion URLs?

          Hugues Chabot added a comment - The Integrate Branch action will be available if (and only if) the build if from a Feature Branch project that has only one Subversion module. Can you check if the builds that are not re-integrable have more than one Subversion URLs?

          Chris Platts added a comment -

          Thanks for the reply,

          Both the parent and the branch projects have only one SVN module defined, however they do both use SVN Externals to pull in other libraries from our SVN repository. These externals are not modified in the projects into which they're pulled, so they should be clean (for us, modifying an external from anywhere other than a separate check-out of the external itself is a smack-able offence )

          Chris Platts added a comment - Thanks for the reply, Both the parent and the branch projects have only one SVN module defined, however they do both use SVN Externals to pull in other libraries from our SVN repository. These externals are not modified in the projects into which they're pulled, so they should be clean (for us, modifying an external from anywhere other than a separate check-out of the external itself is a smack-able offence )

          Hugues Chabot added a comment -

          It makes sense to ignore the content of external SVN repositories for rebase/integrate action.

          Hugues Chabot added a comment - It makes sense to ignore the content of external SVN repositories for rebase/integrate action.

          SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: Hugues Chabot
          Path:
          src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java
          http://jenkins-ci.org/commit/svnmerge-plugin/990dc84985b54b93eb19b1e62048e1c1f3f04402
          Log:
          Merge pull request #14 from hugueschabot/jenkins-23371

          [FIXED JENKINS-23371] Ignore svn:externals when reintegrating branch

          Compare: https://github.com/jenkinsci/svnmerge-plugin/compare/5880b5ac0018...990dc84985b5

          SCM/JIRA link daemon added a comment - Code changed in jenkins User: Hugues Chabot Path: src/main/java/jenkins/plugins/svnmerge/IntegrateAction.java http://jenkins-ci.org/commit/svnmerge-plugin/990dc84985b54b93eb19b1e62048e1c1f3f04402 Log: Merge pull request #14 from hugueschabot/jenkins-23371 [FIXED JENKINS-23371] Ignore svn:externals when reintegrating branch Compare: https://github.com/jenkinsci/svnmerge-plugin/compare/5880b5ac0018...990dc84985b5

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

              Created:
              Updated:
              Resolved: