Bug Fix Merge - Best Approach

[Noble Bell]

I am sure this has been addressed somewhere but I have not been able to locate it.

We have a "Ongoing Development" and "Test" branch setup. We take parts from the development branch to form a build in test. This gets tested in test and then a release is created. All this is working great. Here is where I seem to not understand things. We have uncovered a bug in a piece of code we thought to be good in the test branch. That same code file is currently checked out by another developer in the development branch (he has not checked it in because he has made several changes to the file.) How is the best way to go about the bug fix? Do we fix the bug in test branch and merge it down to the development branch when he checks his code file in? Or is there another, better approach to do this?

Thanks in advance.

[lbauer]

Do we fix the bug in test branch and merge it down to the development branch when he checks his code file in? Or is there another, better approach to do this?

Yes, this would work. Or, you could fix the bug in the Test branch, merge the change, and then the developer's workin folder changes would be in a Needs Merge state. He would use the Show Merge command to merge his changes into the latest version in the Ongoing Development trunk.

[Noble Bell]

Ok. If he has the files checked out exclusively, will I still be able to do a merge?
I tried it and it told me that I could not modify the files because they were checked out exclusively to him.

[lbauer]

Ok. If he has the files checked out exclusively, will I still be able to do a merge?

Not if you're merging into the file he has checked out. The merge tool needs to checkout the files in order to merge them, and if another user has them checked out exclusively, that will fail.