Deleting Files in a branch

davecourt · Post by **davecourt** » Thu Aug 26, 2004 9:03 am

Hi

I have scanned the forum but cannot find anything about this.

I have branched a project off the mainline and then deleted a file within the branch. When I try to merge the branch back into the main line it appears to ignore the fact that I have deleted a file in the branch. I was hoping it would give me the option to then delete the file out of the mainline too having realised the differences between the two structures.

Would anyone be able to shed any light onto this?

Thanks.

ericsink · Post by **ericsink** » Thu Aug 26, 2004 12:52 pm

This looks very similar to another post you've made. Is it the same problem?

My first guess at the solution is the same as the other one: Make sure you're selecting the right range of revisions.

davecourt · Post by **davecourt** » Fri Aug 27, 2004 1:34 am

I have managed to solve the original problem, but this one I have not.

Could you offer some advice on deleted items?

ericsink · Post by **ericsink** » Fri Aug 27, 2004 5:55 am

davecourt wrote:I have managed to solve the original problem, but this one I have not.

Could you offer some advice on deleted items?

I think I'll need some more information.

How did you solve the other problem?

Exactly what steps are you following when this current problem happens?

davecourt · Post by **davecourt** » Fri Aug 27, 2004 6:09 am

Hi there

As you explained in the previous post, I wasn't selecting the different versions to establish the difference between the two files and this is why it wasn't updating the trunk version of the project.

The problem I am having with deleting however is that I delete a file from the branch copy of the project and then when I try and merge it back in with the trunk (by selecting the two versions it changed on) it does not make any difference to the trunk? The trunk still has the deleted file.

Hope this makes a little more sense.

Thanks Eric.

ericsink · Post by **ericsink** » Fri Aug 27, 2004 9:57 am

davecourt wrote:Hi there

As you explained in the previous post, I wasn't selecting the different versions to establish the difference between the two files and this is why it wasn't updating the trunk version of the project.

The problem I am having with deleting however is that I delete a file from the branch copy of the project and then when I try and merge it back in with the trunk (by selecting the two versions it changed on) it does not make any difference to the trunk? The trunk still has the deleted file.

Hope this makes a little more sense.

Thanks Eric.

It makes sense, but I'm still not sure what the problem is. I don't think we have any known situations where this fails. It works for me, and it doesn't work for you. Something in your situation is different from mine, and I don't yet know what it is.

Is there any other information you can provide? Too much detail is never harmful.