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

Integrate branch gives "No changes to be integrated"

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Open (View Workflow)
    • Priority: Critical
    • Resolution: Unresolved
    • Component/s: svnmerge-plugin
    • Labels:
      None
    • Environment:
      svn, Version 1.6.17 (r1128011) (client version on jenkins)
      SVN/1.6.17 SVNKit/1.3.7-1 (http://svnkit.com/) t20111225_1716 (SVN Server version)
      Jenkins ver. 1.488
      Jenkins svnmerge plugin 1.2
    • Similar Issues:

      Description

      1. Create a project with "Accept Integration from Subversion feature branches"
      2. SCM setting: check out trunk of a subversion project
      3. build the trunk project
      4. Create a feature branch from this project in jenkins (I called it "development")
      5. build the branch project
      6. integrate the build in the trunk - works correctly
      7. change some files in the branch and commit those changes
      8. build the branch project again
      9. integrate the new build in the trunk

      Gives:

      No changes to be integrated. Skipping integration.
      Completed

      Expected: the modified files are merged into the trunk

        Attachments

          Activity

          lasrik Tobias Dittrich created issue -
          lasrik Tobias Dittrich made changes -
          Field Original Value New Value
          Description # Create a project with "Accept Integration from Subversion feature branches"
          # check out trunk of a subversion project
          # build the trunk project
          # Create a feature branch from this project in jenkins (I called it "development")
          # build the branch project
          # integrate the build in the trunk - works correctly
          # change some files in the branch and commit those changes
          # build the branch project again
          # integrate the new build in the trunk

          Gives:

          {quote}No changes to be integrated. Skipping integration.
          Completed{quote}
          # Create a project with "Accept Integration from Subversion feature branches"
          # SCM setting: check out trunk of a subversion project
          # build the trunk project
          # Create a feature branch from this project in jenkins (I called it "development")
          # build the branch project
          # integrate the build in the trunk - works correctly
          # change some files in the branch and commit those changes
          # build the branch project again
          # integrate the new build in the trunk

          Gives:

          {quote}No changes to be integrated. Skipping integration.
          Completed{quote}
          lasrik Tobias Dittrich made changes -
          Description # Create a project with "Accept Integration from Subversion feature branches"
          # SCM setting: check out trunk of a subversion project
          # build the trunk project
          # Create a feature branch from this project in jenkins (I called it "development")
          # build the branch project
          # integrate the build in the trunk - works correctly
          # change some files in the branch and commit those changes
          # build the branch project again
          # integrate the new build in the trunk

          Gives:

          {quote}No changes to be integrated. Skipping integration.
          Completed{quote}
          # Create a project with "Accept Integration from Subversion feature branches"
          # SCM setting: check out trunk of a subversion project
          # build the trunk project
          # Create a feature branch from this project in jenkins (I called it "development")
          # build the branch project
          # integrate the build in the trunk - works correctly
          # change some files in the branch and commit those changes
          # build the branch project again
          # integrate the new build in the trunk

          Gives:

          {quote}No changes to be integrated. Skipping integration.
          Completed{quote}

          Expected: the modified files are merged into the trunk
          rtyler R. Tyler Croy made changes -
          Workflow JNJira [ 146460 ] JNJira + In-Review [ 176626 ]

            People

            Assignee:
            kohsuke Kohsuke Kawaguchi
            Reporter:
            lasrik Tobias Dittrich
            Votes:
            1 Vote for this issue
            Watchers:
            3 Start watching this issue

              Dates

              Created:
              Updated: