Subversion reverting resolved file
Quote
If I was to make an error in a file that I have marked resolved is there a way to go back to having the file in it's original conflicted state without reverting all changes and reattempting the merge?
Quote
No, there is no automatic way to do that. If you want to be able to do that, you'll have to manually back up the .mine file ahead of time so that you can get it back if needed.
Well now you don't have you waste your time, you can redo your conflict resolves using the enclosed script. (included is the .ahk and .exe file). It's a bit spartan but the GUI will guide you throughu the process:
* Select working copy root
* Find all .working files
* For each .working file find all other extensions with the same filename (.merge-left.rXXXX and .merge-right.rXXXX files and the actual file)
* copy these into a SvnConflictsBackup\<date>\<directory_structure>\file on your desktop
* Show Finished(remove) and Restore button
* Finish: exit and open backup folder for deletion by user
*: choose from all .working files and restore it and related files
When you are resolving conflicts, think of this utility and use it to back them up!
SvnConflictsBackup.zip
Logged
Bard
S.VanDragt.com
(yes we do use SVN every day, about 40 projects/repos)
