Tortoise SVN doing import after export
Let's assume that I've exported my local repo because I didn't want to have .svn directories in it. Then I've made changes in my exported copy and I would like to import it back to my local repo. Is it po开发者_JAVA技巧ssible?
I would use WinMerge to compare the working copy with the exported one, and merge back the changes from the exported working copy to the actual working copy:
- new files must be added to the WC
- deleted files must be deleted from the WC
- different files must be replaced in the WC by the ones in the exported WC.
After the merge is done, commit the WC and don't ever make changes anymore in an exported WC.
The easiest way I find is to check out a fresh working copy and then copy recursively (drag & drop) your exported directory over the working copy directory.
You should get a working copy with the changes you made in your exported directory where you can commit them to the repository.
精彩评论