Situation:

we have a main branch and a child branch off main.

I just merged the child branch up to main. I want to lock the child branch so I have the following lines in "p4 protect" in that order:

write group dev * //depot/<product1>/... write group dev * //depot/<product2>/... write group dev * -//depot/.../child/...

Now someone wants to change some of the merged file in main, and submit the changes. No can do! "cannot lock file..." message! If someone edit and submit a file in main that was not part of the merge: no problem!

So my stopgap solution was to open up the child branch again (removing the "write group dev * -//depot/.../child/..." line from "p4 protect") which allows developers to edit and submit files that were merged from the child branch.

This doesn't seem to be the right behavior. What is it I am doing wrong?

Thanks for the help.

P