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

an update which contains added files merged from a branch results in those files having doubled content

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Resolved (View Workflow)
    • Priority: Major
    • Resolution: Fixed
    • Component/s: subversion-plugin
    • Labels:
      None
    • Environment:
      sles 11, Jenkins 1.470, subversion server is CollabNet Subversion Edge 1.3.1
    • Similar Issues:

      Description

      Using the "Emulate clean checkout by first deleting unversioned/ignored files, then 'svn update'" svn strategy, we recently had a branch merged into
      trunk that added some files. When the Jenkins jobs configured as above
      ran against trunk, those added files had their content duplicated.

      A quick google suggested it has happened before:

      http://grokbase.com/p/lucene/dev/126m8fpw9q/jenkins-lucene-solr-tests-only-4-x-build-137-still-failing

        Attachments

          Issue Links

          is duplicated by

          Bug - A problem which impairs or prevents the functions of the product. JENKINS-18140 SVNKit 1.7.6 library used in Jenkins causes file contents SVN checkouts to become duplicated

          • Major - Major loss of function.
          • Resolved

            Activity

            Descending order - Click to sort in ascending order
            Hide
            Permalink
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: Christoph Kutzinski
            Path:
            pom.xml
            http://jenkins-ci.org/commit/subversion-plugin/3599af503fc0a10bf29e3dfab1619ed53a2e71fc
            Log:
            [FIXED JENKINS-14551] added files merged from a branch results in those files having doubled content

            Compare: https://github.com/jenkinsci/subversion-plugin/compare/5fb0b85fcf2c^...3599af503fc0

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Christoph Kutzinski Path: pom.xml http://jenkins-ci.org/commit/subversion-plugin/3599af503fc0a10bf29e3dfab1619ed53a2e71fc Log: [FIXED JENKINS-14551] added files merged from a branch results in those files having doubled content Compare: https://github.com/jenkinsci/subversion-plugin/compare/5fb0b85fcf2c ^...3599af503fc0
            Hide
            Permalink
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: Nicolas De loof
            Path:
            svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc/SVNUpdateEditor15.java
            http://jenkins-ci.org/commit/svnkit/aec5b5033ebcf927978e1764379bcbcb3989b900
            Log:
            Merge pull request #1 from theotherwhitemeat/master

            A fix for JENKINS-14551

            Compare: https://github.com/jenkinsci/svnkit/compare/9bea57e044b4...aec5b5033ebc

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Nicolas De loof Path: svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc/SVNUpdateEditor15.java http://jenkins-ci.org/commit/svnkit/aec5b5033ebcf927978e1764379bcbcb3989b900 Log: Merge pull request #1 from theotherwhitemeat/master A fix for JENKINS-14551 Compare: https://github.com/jenkinsci/svnkit/compare/9bea57e044b4...aec5b5033ebc
            Hide
            Permalink
            scm_issue_link SCM/JIRA link daemon added a comment -

            Code changed in jenkins
            User: Kenny Ayers
            Path:
            svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc/SVNUpdateEditor15.java
            http://jenkins-ci.org/commit/svnkit/27decb28216ee4fd15b8fcbdb769bf41d81978eb
            Log:
            Removing duplicate myFileFetcher.fetchFile() call. JENKINS-14551

            Show
            scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: Kenny Ayers Path: svnkit/src/main/java/org/tmatesoft/svn/core/internal/wc/SVNUpdateEditor15.java http://jenkins-ci.org/commit/svnkit/27decb28216ee4fd15b8fcbdb769bf41d81978eb Log: Removing duplicate myFileFetcher.fetchFile() call. JENKINS-14551
            Hide
            Permalink
            rocco LuFrija added a comment -

            Hi guys,

            Thanks for your fast reply!

            I guess I found the problem...it's all about my company's proxy! In fact having a closer look at the failing tests I could see something like:

            ERROR: Failed to check out https://svn.jenkins-ci.org/trunk/hudson/test-projects/trivial-ant

            I'm now copying with it somehow, in the meantime I'm testing the hpi file uploaded by Kenny.

            Show
            rocco LuFrija added a comment - Hi guys, Thanks for your fast reply! I guess I found the problem...it's all about my company's proxy! In fact having a closer look at the failing tests I could see something like: ERROR: Failed to check out https://svn.jenkins-ci.org/trunk/hudson/test-projects/trivial-ant I'm now copying with it somehow, in the meantime I'm testing the hpi file uploaded by Kenny.
            Hide
            Permalink
            kayers Kenny Ayers added a comment -

            Hey LuFrija,

            If my memory is correct, I had to do the same thing - modify the build command for SVNKit, then copy the resultant jar file into my local maven repo, then build subversion-plugin against that.

            This seems like a hacky workflow, but it's the best I could stitch together given there are no instructions on how to build this properly, and the mailing list didn't respond to my question on how to build the correct way.

            Are you good to go now?

            -Kenny

            Show
            kayers Kenny Ayers added a comment - Hey LuFrija, If my memory is correct, I had to do the same thing - modify the build command for SVNKit, then copy the resultant jar file into my local maven repo, then build subversion-plugin against that. This seems like a hacky workflow, but it's the best I could stitch together given there are no instructions on how to build this properly, and the mailing list didn't respond to my question on how to build the correct way. Are you good to go now? -Kenny
            30 older comments

              People

              Assignee:
              Unassigned Unassigned
              Reporter:
              cjw296 Chris Withers
              Votes:
              34 Vote for this issue
              Watchers:
              36 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: