hudson.util.IOException2: Failed to merge

Jenkins JIRA | Jeff Fillmore | 1 year ago
tip
Do you know that we can give you better hits? Get more relevant results from Samebug’s stack trace search.
  1. 0

    When trying to merge a feature branch into trunk we keep getting this error: ERROR: Step ‘Integrate to upstream upon successful build’ aborted due to exception: hudson.util.IOException2: Failed to merge at jenkins.plugins.svnmerge.FeatureBranchProperty$2.invoke(FeatureBranchProperty.java:412) at jenkins.plugins.svnmerge.FeatureBranchProperty$2.invoke(FeatureBranchProperty.java:292) at hudson.FilePath.act(FilePath.java:990) at hudson.FilePath.act(FilePath.java:968) at jenkins.plugins.svnmerge.FeatureBranchProperty.integrate(FeatureBranchProperty.java:292) at jenkins.plugins.svnmerge.IntegrateAction.perform(IntegrateAction.java:175) at jenkins.plugins.svnmerge.IntegrateAction.perform(IntegrateAction.java:165) at jenkins.plugins.svnmerge.IntegrationPublisher.perform(IntegrationPublisher.java:51) at hudson.tasks.BuildStepMonitor$2.perform(BuildStepMonitor.java:32) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:782) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:723) at hudson.model.Build$BuildExecution.post2(Build.java:185) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:668) at hudson.model.Run.execute(Run.java:1763) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43) at hudson.model.ResourceController.execute(ResourceController.java:98) at hudson.model.Executor.run(Executor.java:410) Caused by: org.tmatesoft.svn.core.SVNException: svn: E195016: Cannot merge into a working copy with a switched subtree at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeDriver.ensureWcIsSuitableForMerge(SvnNgMergeDriver.java:236) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate.merge(SvnNgMergeReintegrate.java:107) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate.run(SvnNgMergeReintegrate.java:65) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate.run(SvnNgMergeReintegrate.java:45) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgOperationRunner.run(SvnNgOperationRunner.java:20) at org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner.run(SvnOperationRunner.java:21) at org.tmatesoft.svn.core.wc2.SvnOperationFactory.run(SvnOperationFactory.java:1235) at org.tmatesoft.svn.core.wc2.SvnOperation.run(SvnOperation.java:294) at org.tmatesoft.svn.core.wc.SVNDiffClient.doMergeReIntegrate(SVNDiffClient.java:2632) at jenkins.plugins.svnmerge.FeatureBranchProperty$2.invoke(FeatureBranchProperty.java:346) ... 16 more The project is up to date for rebaseing: Rebasing is in progress Updating workspace to the latest revision At revision 29259 Merging change from the upstream https://****/svn/marketforce1_lf1/trunk at rev.29258 Committing changes No changes since the last rebase. This rebase was a no-op. Completed

    Jenkins JIRA | 1 year ago | Jeff Fillmore
    hudson.util.IOException2: Failed to merge
  2. 0

    When trying to merge a feature branch into trunk we keep getting this error: ERROR: Step ‘Integrate to upstream upon successful build’ aborted due to exception: hudson.util.IOException2: Failed to merge at jenkins.plugins.svnmerge.FeatureBranchProperty$2.invoke(FeatureBranchProperty.java:412) at jenkins.plugins.svnmerge.FeatureBranchProperty$2.invoke(FeatureBranchProperty.java:292) at hudson.FilePath.act(FilePath.java:990) at hudson.FilePath.act(FilePath.java:968) at jenkins.plugins.svnmerge.FeatureBranchProperty.integrate(FeatureBranchProperty.java:292) at jenkins.plugins.svnmerge.IntegrateAction.perform(IntegrateAction.java:175) at jenkins.plugins.svnmerge.IntegrateAction.perform(IntegrateAction.java:165) at jenkins.plugins.svnmerge.IntegrationPublisher.perform(IntegrationPublisher.java:51) at hudson.tasks.BuildStepMonitor$2.perform(BuildStepMonitor.java:32) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:782) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:723) at hudson.model.Build$BuildExecution.post2(Build.java:185) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:668) at hudson.model.Run.execute(Run.java:1763) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43) at hudson.model.ResourceController.execute(ResourceController.java:98) at hudson.model.Executor.run(Executor.java:410) Caused by: org.tmatesoft.svn.core.SVNException: svn: E195016: Cannot merge into a working copy with a switched subtree at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64) at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeDriver.ensureWcIsSuitableForMerge(SvnNgMergeDriver.java:236) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate.merge(SvnNgMergeReintegrate.java:107) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate.run(SvnNgMergeReintegrate.java:65) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate.run(SvnNgMergeReintegrate.java:45) at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgOperationRunner.run(SvnNgOperationRunner.java:20) at org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner.run(SvnOperationRunner.java:21) at org.tmatesoft.svn.core.wc2.SvnOperationFactory.run(SvnOperationFactory.java:1235) at org.tmatesoft.svn.core.wc2.SvnOperation.run(SvnOperation.java:294) at org.tmatesoft.svn.core.wc.SVNDiffClient.doMergeReIntegrate(SVNDiffClient.java:2632) at jenkins.plugins.svnmerge.FeatureBranchProperty$2.invoke(FeatureBranchProperty.java:346) ... 16 more The project is up to date for rebaseing: Rebasing is in progress Updating workspace to the latest revision At revision 29259 Merging change from the upstream https://****/svn/marketforce1_lf1/trunk at rev.29258 Committing changes No changes since the last rebase. This rebase was a no-op. Completed

    Jenkins JIRA | 1 year ago | Jeff Fillmore
    hudson.util.IOException2: Failed to merge
  3. 0

    [JIRA] [svnmerge-plugin] (JENKINS-33626) Cannot merge into a working copy with a switched subtree

    Google Groups | 1 year ago | jfillmor@calliduscloud.com (JIRA)
    hudson.util.IOException2: Failed to merge
  4. Speed up your debug routine!

    Automated exception search integrated into your IDE

    Root Cause Analysis

    1. org.tmatesoft.svn.core.SVNException

      svn: E195016: Cannot merge into a working copy with a switched subtree

      at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error()
    2. SVNKit Library
      SVNDiffClient.doMergeReIntegrate
      1. org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
      2. org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51)
      3. org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeDriver.ensureWcIsSuitableForMerge(SvnNgMergeDriver.java:236)
      4. org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate.merge(SvnNgMergeReintegrate.java:107)
      5. org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate.run(SvnNgMergeReintegrate.java:65)
      6. org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeReintegrate.run(SvnNgMergeReintegrate.java:45)
      7. org.tmatesoft.svn.core.internal.wc2.ng.SvnNgOperationRunner.run(SvnNgOperationRunner.java:20)
      8. org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner.run(SvnOperationRunner.java:21)
      9. org.tmatesoft.svn.core.wc2.SvnOperationFactory.run(SvnOperationFactory.java:1235)
      10. org.tmatesoft.svn.core.wc2.SvnOperation.run(SvnOperation.java:294)
      11. org.tmatesoft.svn.core.wc.SVNDiffClient.doMergeReIntegrate(SVNDiffClient.java:2632)
      11 frames
    3. jenkins.plugins.svnmerge
      FeatureBranchProperty$2.invoke
      1. jenkins.plugins.svnmerge.FeatureBranchProperty$2.invoke(FeatureBranchProperty.java:346)
      2. jenkins.plugins.svnmerge.FeatureBranchProperty$2.invoke(FeatureBranchProperty.java:292)
      2 frames
    4. Hudson
      FilePath.act
      1. hudson.FilePath.act(FilePath.java:990)
      2. hudson.FilePath.act(FilePath.java:968)
      2 frames
    5. jenkins.plugins.svnmerge
      IntegrationPublisher.perform
      1. jenkins.plugins.svnmerge.FeatureBranchProperty.integrate(FeatureBranchProperty.java:292)
      2. jenkins.plugins.svnmerge.IntegrateAction.perform(IntegrateAction.java:175)
      3. jenkins.plugins.svnmerge.IntegrateAction.perform(IntegrateAction.java:165)
      4. jenkins.plugins.svnmerge.IntegrationPublisher.perform(IntegrationPublisher.java:51)
      4 frames
    6. Hudson
      Executor.run
      1. hudson.tasks.BuildStepMonitor$2.perform(BuildStepMonitor.java:32)
      2. hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:782)
      3. hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:723)
      4. hudson.model.Build$BuildExecution.post2(Build.java:185)
      5. hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:668)
      6. hudson.model.Run.execute(Run.java:1763)
      7. hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
      8. hudson.model.ResourceController.execute(ResourceController.java:98)
      9. hudson.model.Executor.run(Executor.java:410)
      9 frames