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?
