At my company we make a new branch/folder for every release. In the 1.0 folder, there is a changelist that introduced a bug. Unfortunately, 1.0 is shipped and we are working on 2.0. How can I take the changes in the 1.0 changelist and revert them only in the 2.0 folder?
I can think of the following solution.
- Back out that revision in 1.0
- Submit it
- Integrate between 1.0 and 2.0 to apply the changes made by backing out.
However, the 1.0 branch should be locked since it is shipped. Can I do this without submitting a changelist to 1.0?
You should be able to create the necessary changelist on the 1.0 branch without submitting it, and then integrate to HEAD in your 2.0 branch and apply it there. Instructions here.