Merge problems

[CodingGorilla]

I'm not sure if I'm experiencing problems with merging, or if I'm just misunderstanding something.

So in a branch I deleted some projects that had been refactored out and were no longer needed:

http://screencast.com/t/UEYg45q3D4

Then I merged that branch down to /main:

http://screencast.com/t/C4RiqHFm

Then I merged that down to another branch:

http://screencast.com/t/2TiH42U93Bs

And I see in the changeset diff:

http://screencast.com/t/jDz3kd7ZRG4a

But when I browse the repository on that branch I see:

http://screencast.com/t/DRf9z3v3W

Shouldn't those folders be gone from this branch now? And then when that branch tries to build on TeamCity I get the following error:

jetbrains.buildServer.agent.impl.patch.PatchDownloaderImpl$1: Server was not able to build correct patch, most likely due to VCS errors
at jetbrains.buildServer.agent.impl.patch.PatchDownloaderImpl.throwError(PatchDownloaderImpl.java:114)
at jetbrains.buildServer.agent.impl.patch.PatchDownloaderImpl.checkPatch(PatchDownloaderImpl.java:104)
at jetbrains.buildServer.agent.impl.patch.PatchDownloaderImpl.copyPatchAndCheck(PatchDownloaderImpl.java:65)
at jetbrains.buildServer.agent.impl.patch.UpdateSourcesPatcherBase.copyPatchToTempFile(UpdateSourcesPatcherBase.java:70)
at jetbrains.buildServer.agent.impl.patch.UpdateSourcesFromServer.updateSources(UpdateSourcesFromServer.java:62)
at jetbrains.buildServer.agent.impl.patch.UpdateSourcesBuildStageBase.doSourceUpdate(UpdateSourcesBuildStageBase.java:91)
at jetbrains.buildServer.agent.impl.patch.UpdateSourcesBuildStageBase.doRecoverableStage(UpdateSourcesBuildStageBase.java:59)
at jetbrains.buildServer.agent.impl.buildStages.startStages.RecoverableBuildStage.doLastAttempt(RecoverableBuildStage.java:112)
at jetbrains.buildServer.agent.impl.buildStages.startStages.RecoverableBuildStage.doBuildStage(RecoverableBuildStage.java:70)
at jetbrains.buildServer.agent.impl.buildStages.BuildStagesExecutor$1.callStage(BuildStagesExecutor.java:31)
at jetbrains.buildServer.agent.impl.buildStages.BuildStagesExecutor$1.callStage(BuildStagesExecutor.java:24)
at jetbrains.buildServer.agent.impl.buildStages.StagesExecutor.callRunStage(StagesExecutor.java:76)
at jetbrains.buildServer.agent.impl.buildStages.StagesExecutor.doStages(StagesExecutor.java:36)
at jetbrains.buildServer.agent.impl.buildStages.BuildStagesExecutor.doStages(BuildStagesExecutor.java:24)
at jetbrains.buildServer.agent.impl.BuildRunAction.doStages(BuildRunAction.java:70)
at jetbrains.buildServer.agent.impl.BuildRunAction.runBuild(BuildRunAction.java:50)
at jetbrains.buildServer.agent.impl.BuildAgentImpl.doActualBuild(BuildAgentImpl.java:242)
at jetbrains.buildServer.agent.impl.BuildAgentImpl.access$100(BuildAgentImpl.java:47)
at jetbrains.buildServer.agent.impl.BuildAgentImpl$1.run(BuildAgentImpl.java:215)
at java.lang.Thread.run(Unknown Source)
Caused by: jetbrains.buildServer.vcs.patches.UnsuccessfulPatchException: Failed to build patch for build #26 {build id=177}, VCS root: repository "ThreeSixty"
path "/"
smartbranch "/main/bug-fix/360" {instance id=6, parent id=7}, due to error: Error getting file contents: The specified revision was not found C:\teamcity-config\system\caches\plasticscm\plasticscm_-7977054734872206299\src\bll\ThreeSixty.Extensions\ObjectSetExtensions.cs#cs:477@rep:ThreeSixty@repserver:dev-storage:8087;C:\TeamCity\temp\plasticscm6522758364575545137catresult\src\bll\ThreeSixty.Extensions\ObjectSetExtensions.cs
at jetbrains.buildServer.vcs.patches.AbstractPatcher$1.fail(AbstractPatcher.java:93)
at jetbrains.buildServer.vcs.patches.LowLevelPatcher.readPatchStream(LowLevelPatcher.java:156)
at jetbrains.buildServer.vcs.patches.LowLevelPatcher.applyPatch(LowLevelPatcher.java:79)
at jetbrains.buildServer.vcs.patches.AbstractPatcher.applyPatch(AbstractPatcher.java:42)
at jetbrains.buildServer.agent.impl.patch.PatchApplierImpl.applyPatch(PatchApplierImpl.java:18)
at jetbrains.buildServer.agent.impl.patch.PatchDownloaderImpl.checkPatchInFileIsCompleted(PatchDownloaderImpl.java:84)
at jetbrains.buildServer.agent.impl.patch.PatchDownloaderImpl.checkPatch(PatchDownloaderImpl.java:94)
... 18 more
[/Code]

You can see it looks like it's trying to retrieve those files from the repository but they're not there? But they are there?

I'm so confused....

[CodingGorilla]

Ok, disregard this. I shut down TeamCity and uninstalled and reinstalled Plastic and everything seems fine now. I think the lesson here is that when you update the plastic client, make sure you stop all of the TeamCity services first.