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

Merges across named branches should not be ignored

    XMLWordPrintable

    Details

    • Similar Issues:

      Description

      By fixing JENKINS-4972, the mercurial plugin discards merges for the purpose of triggering builds and determining culprits.

      This makes sense when the merge is within a single named branch (i.e. it is during the regular flow of development).

      It does not make a lot of sense to drop the merge when it is a merge across named branches. These merges are typically merges of a fix from one version branch to another version branch, and if this merge introduces errors, the merger wants to know about it.

        Attachments

          Issue Links

            Activity

            Hide
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: Jesse Glick
            Path:
            src/main/java/hudson/plugins/mercurial/HgExe.java
            src/main/java/hudson/plugins/mercurial/MercurialSCM.java
            src/test/java/hudson/plugins/mercurial/MercurialSCMTest.java
            http://jenkins-ci.org/commit/mercurial-plugin/3b54094736fc31fe159c2f5fa80d91b64db47851
            Log:
            [FIXED JENKINS-7594] Merges across named branches should not be ignored.
            Rewriting compareRemoteRevisionWith to use 'hg st --rev ... --rev ...' which is simpler and more robust than examining intermediate csets.

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Jesse Glick Path: src/main/java/hudson/plugins/mercurial/HgExe.java src/main/java/hudson/plugins/mercurial/MercurialSCM.java src/test/java/hudson/plugins/mercurial/MercurialSCMTest.java http://jenkins-ci.org/commit/mercurial-plugin/3b54094736fc31fe159c2f5fa80d91b64db47851 Log: [FIXED JENKINS-7594] Merges across named branches should not be ignored. Rewriting compareRemoteRevisionWith to use 'hg st --rev ... --rev ...' which is simpler and more robust than examining intermediate csets.
            Hide
            dogfood dogfood added a comment -

            Integrated in plugins_mercurial #84
            [FIXED JENKINS-7594] Merges across named branches should not be ignored.

            Jesse Glick :
            Files :

            • src/test/java/hudson/plugins/mercurial/MercurialSCMTest.java
            • src/main/java/hudson/plugins/mercurial/HgExe.java
            • src/main/java/hudson/plugins/mercurial/MercurialSCM.java
            Show
            dogfood dogfood added a comment - Integrated in plugins_mercurial #84 [FIXED JENKINS-7594] Merges across named branches should not be ignored. Jesse Glick : Files : src/test/java/hudson/plugins/mercurial/MercurialSCMTest.java src/main/java/hudson/plugins/mercurial/HgExe.java src/main/java/hudson/plugins/mercurial/MercurialSCM.java
            Hide
            haraldme haraldme added a comment -

            This issue was resolved some weeks ago – but I've been unable to find any info about plans for making the fix part of a new release of the plugin. The list of issues under the "Version 1.39 (Under Development)" heading on https://wiki.jenkins-ci.org/display/JENKINS/Mercurial+Plugin does not mention this bug.

            The "don't trigger build on merge commits" misfeature regularly causes my team to miss out on Jenkins builds (which in turn means that build-breaking culprits may get out of bringing the otherwise compulsory "I broke the build" cake), so we're eagerly looking forward to having this fixed.

            Show
            haraldme haraldme added a comment - This issue was resolved some weeks ago – but I've been unable to find any info about plans for making the fix part of a new release of the plugin. The list of issues under the "Version 1.39 (Under Development)" heading on https://wiki.jenkins-ci.org/display/JENKINS/Mercurial+Plugin does not mention this bug. The "don't trigger build on merge commits" misfeature regularly causes my team to miss out on Jenkins builds (which in turn means that build-breaking culprits may get out of bringing the otherwise compulsory "I broke the build" cake), so we're eagerly looking forward to having this fixed.
            Hide
            ridesmet Ringo De Smet added a comment -

            Like harald, I would like to see these fixes rolled into a release of the plugin.

            Show
            ridesmet Ringo De Smet added a comment - Like harald, I would like to see these fixes rolled into a release of the plugin.
            Hide
            jglick Jesse Glick added a comment -

            Many significant changes and refactorings have made in dev sources so I am not surprised the wiki is out of date.

            I am not currently doing plugin releases (pending info on how to simultaneously publish for Hudson), but one of the other devs on the project might.

            Show
            jglick Jesse Glick added a comment - Many significant changes and refactorings have made in dev sources so I am not surprised the wiki is out of date. I am not currently doing plugin releases (pending info on how to simultaneously publish for Hudson), but one of the other devs on the project might.

              People

              • Assignee:
                jglick Jesse Glick
                Reporter:
                willemv Willem Verstraeten
              • Votes:
                5 Vote for this issue
                Watchers:
                7 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved: