<< Back to previous view |
[QB-1143] build failed by :svn Conflicts found.
|
|
Status: | Resolved |
Project: | QuickBuild |
Component/s: | None |
Affects Version/s: | 4.0.15 |
Fix Version/s: | None |
Type: | Bug | Priority: | Major |
Reporter: | qxo | Assigned To: | Robin Shen |
Resolution: | Won't Fix | Votes: | 0 |
Remaining Estimate: | Unknown | Time Spent: | Unknown |
Original Estimate: | Unknown |
Description |
2:39:02,385 [master>check out from code repository@b-server03:8810] ERROR - Step 'master>check out from code repository' is failed.
com.pmease.quickbuild.QuickbuildException: Conflicts found. at com.pmease.quickbuild.plugin.scm.svn.SvnRepository.checkoutByRevision(SvnRepository.java:390) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository$$EnhancerByCGLIB$$df0b5790.CGLIB$checkoutByRevision$15(<generated>) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository$$EnhancerByCGLIB$$df0b5790$$FastClassByCGLIB$$15a854b6.invoke(<generated>) at net.sf.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:215) at com.pmease.quickbuild.DefaultScriptEngine$Interpolator.intercept(DefaultScriptEngine.java:270) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository$$EnhancerByCGLIB$$df0b5790.checkoutByRevision(<generated>) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository.checkoutByRevision(SvnRepository.java:1) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository$$EnhancerByCGLIB$$df0b5790.CGLIB$checkoutByRevision$14(<generated>) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository$$EnhancerByCGLIB$$df0b5790$$FastClassByCGLIB$$15a854b6.invoke(<generated>) at net.sf.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:215) at com.pmease.quickbuild.DefaultScriptEngine$Interpolator.intercept(DefaultScriptEngine.java:270) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository$$EnhancerByCGLIB$$df0b5790.checkoutByRevision(<generated>) at com.pmease.quickbuild.repositorysupport.Repository.checkout(Repository.java:207) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository$$EnhancerByCGLIB$$df0b5790.CGLIB$checkout$54(<generated>) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository$$EnhancerByCGLIB$$df0b5790$$FastClassByCGLIB$$15a854b6.invoke(<generated>) at net.sf.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:215) at com.pmease.quickbuild.DefaultScriptEngine$Interpolator.intercept(DefaultScriptEngine.java:270) at com.pmease.quickbuild.plugin.scm.svn.SvnRepository$$EnhancerByCGLIB$$df0b5790.checkout(<generated>) at com.pmease.quickbuild.plugin.basis.checkout.CheckoutStep.run(CheckoutStep.java:77) at com.pmease.quickbuild.plugin.basis.checkout.CheckoutStep$$EnhancerByCGLIB$$208e45b3.CGLIB$run$0(<generated>) at com.pmease.quickbuild.plugin.basis.checkout.CheckoutStep$$EnhancerByCGLIB$$208e45b3$$FastClassByCGLIB$$e3e0fc3d.invoke(<generated>) at net.sf.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:215) at com.pmease.quickbuild.DefaultScriptEngine$Interpolator.intercept(DefaultScriptEngine.java:270) at com.pmease.quickbuild.plugin.basis.checkout.CheckoutStep$$EnhancerByCGLIB$$208e45b3.run(<generated>) at com.pmease.quickbuild.stepsupport.Step.execute(Step.java:473) at com.pmease.quickbuild.stepsupport.StepExecutionJob.executeStepAwareJob(StepExecutionJob.java:29) at com.pmease.quickbuild.stepsupport.StepAwareJob.executeBuildAwareJob(StepAwareJob.java:47) at com.pmease.quickbuild.BuildAwareJob.execute(BuildAwareJob.java:61) at com.pmease.quickbuild.grid.GridJob.run(GridJob.java:78) at java.lang.Thread.run(Thread.java:662) |
Comments |
Comment by Robin Shen [ 20/Nov/11 05:30 AM ] |
Does your build modifies checked out files? If yes, the conflicts can happen and QB will fail the build since build against a conflicted working copy may cause unexpected result. |
Comment by qxo [ 20/Nov/11 05:57 AM ] |
yes,My Ant script will modified check out files. Can I fore check out ? |
Comment by Robin Shen [ 20/Nov/11 06:19 AM ] |
In this case, you may have your checkout step cleaning up the workspace first. |
Comment by qxo [ 21/Nov/11 08:19 AM ] |
support |