Well done! Now play with your working copy as though all those intermediate edits had never happened. You may then be able to merge the two using SVN tools. Then in two separate working copies, one from the trunk, and one from the branch, copy across your changes (trunk) and the freelancers changes (branch) and commit both. If you want to get rid of them, run a svn del on each of them. Do you still also have a copy of the pre-edited one If so, use that to create the trunk, then take a branch at that point. Run svn merge -rXX:YY where XX is the number you obtained in the previous step and YY is the number of the revision you want to revert to.ĭone! The possible exception to this is that files in your working copy that didn't exist when revision YY was originally made, will still be there, because by default svn doesn't remove things. Run svn status -v to see which revision number your working copy now corresponds to (it's the highest revision number in the list that svn status -v produces). SmartSVN - A cross-platform GUI client for Subversion (Not open source. ![]() ![]() Run svn revert to revert your working copy's files to the state they were in when you last committed/checked out. Later the branch can be merged with the trunk. Change to the top directory within your working copy (assuming you want to roll back the whole of the working copy).
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |