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

[svnmerge-plugin] Add support for merging from upstream before building.

XMLWordPrintable

    • Icon: Task Task
    • Resolution: Fixed
    • Icon: Major Major
    • svnmerge-plugin
    • None

      The svnmerge plugin is currently under development and it would be nice if for feature branches it integrated changes from upstream before building.

      The build should fail if there are any conflicts.

          [JENKINS-6851] [svnmerge-plugin] Add support for merging from upstream before building.

          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

          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

            Unassigned Unassigned
            pablotdl pablotdl
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved: