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

More control on Automatic Rebase feature

    Details

    • Similar Issues:

      Description

      The "Automatic Rebase" feature can be useful when many developers are working on many different branches and occasionally such a branch is released and the relative code is merged into the trunk. On such event, all the other branches should be "rebased" to integrate the latest production code. The feature can be configured as a pre-build-step to do the rebase automatically on build.

      The default behaviour of the current version is to revert the changes on the local workspace, thus ignoring the new code in the trunk, in case of a conflicted merge, and let the build go on.

      In some workflows, this can cause the feature branch version to be deployed on acceptance environment without including the latest upstream features.

      It will be very useful if the pre-build-step could optionally trigger a failure of the build, this way the developer would have evidence of the need to rebase the code of his branch.

      I suggest some way to configure, optionally, the "Rebase with upstream subversion revision" pre-build-step to trigger the failure of the build, using something like a checkbox in the build configuration options.

        Attachments

          Issue Links

            Activity

            Hide
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: vernyquartara
            Path:
            src/main/java/jenkins/plugins/svnmerge/RebaseBuilder.java
            src/main/resources/jenkins/plugins/svnmerge/RebaseBuilder/config.groovy
            http://jenkins-ci.org/commit/svnmerge-plugin/f1058d129b36f77a5f84117c3c52e1a43d5fab0a
            Log:
            [FIXED JENKINS-22850]

            Added a checkbox in the pre-build-step configuration, to let the user
            choose whether to stop the build or not in the case the of a failed
            automatic rebase

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: vernyquartara Path: src/main/java/jenkins/plugins/svnmerge/RebaseBuilder.java src/main/resources/jenkins/plugins/svnmerge/RebaseBuilder/config.groovy http://jenkins-ci.org/commit/svnmerge-plugin/f1058d129b36f77a5f84117c3c52e1a43d5fab0a Log: [FIXED JENKINS-22850] Added a checkbox in the pre-build-step configuration, to let the user choose whether to stop the build or not in the case the of a failed automatic rebase
            Hide
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: Hugues Chabot
            Path:
            src/main/java/jenkins/plugins/svnmerge/RebaseBuilder.java
            src/main/resources/jenkins/plugins/svnmerge/RebaseBuilder/config.groovy
            http://jenkins-ci.org/commit/svnmerge-plugin/ca285ed64c316ae769363291c7033a27bb90a4ed
            Log:
            Merge pull request #12 from vernyquartara/JENKINS-22850

            [FIXED JENKINS-22850] [FIXED JENKINS-6851] Added option on "Automatic Rebase" action to fail the build when merge conflicts are found.

            Compare: https://github.com/jenkinsci/svnmerge-plugin/compare/368a0576de66...ca285ed64c31

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Hugues Chabot Path: src/main/java/jenkins/plugins/svnmerge/RebaseBuilder.java src/main/resources/jenkins/plugins/svnmerge/RebaseBuilder/config.groovy http://jenkins-ci.org/commit/svnmerge-plugin/ca285ed64c316ae769363291c7033a27bb90a4ed Log: Merge pull request #12 from vernyquartara/ JENKINS-22850 [FIXED JENKINS-22850] [FIXED JENKINS-6851] Added option on "Automatic Rebase" action to fail the build when merge conflicts are found. Compare: https://github.com/jenkinsci/svnmerge-plugin/compare/368a0576de66...ca285ed64c31

              People

              • Assignee:
                kohsuke Kohsuke Kawaguchi
                Reporter:
                verny Verny Quartara Gutierrez
              • Votes:
                0 Vote for this issue
                Watchers:
                2 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: