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

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

    XMLWordPrintable

Details

    Description

      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.

      Attachments

        Issue Links

          Activity

            pablotdl pablotdl created issue -
            kutzi kutzi made changes -
            Field Original Value New Value
            Component/s svnmerge [ 15739 ]
            Component/s other [ 15490 ]
            hugueschabot Hugues Chabot made changes -
            Link This issue depends on JENKINS-22850 [ JENKINS-22850 ]

            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_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
            hugueschabot Hugues Chabot made changes -
            Resolution Fixed [ 1 ]
            Status Open [ 1 ] Resolved [ 5 ]
            rtyler R. Tyler Croy made changes -
            Workflow JNJira [ 136946 ] JNJira + In-Review [ 187323 ]

            People

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

              Dates

                Created:
                Updated:
                Resolved: