> Often I have small changes that apply to a branch and the trunk > alike. Of > course I cannot do a normal merge because the local change doesn't > have a > revision number yet. > > If I copy the change from the branch to the trunk or vice versa and > then > commit it in one single commit, will it break merge tracking?
If you do commit the same change manually to trunk and branch and then you try to do a merge you will get a conflict. You can do a --record-only merge after the fact to resolve that problem though. Or just deal with the conflict when you do finally merge. BOb
