I used to do that with SVN. What a pain in the ass.

Git's version is miles better.