Every windows svn client I've tried crashes at the end of reverting three bad branch merges. I'd like to get them away from the head of our trunk, ideally erae them forever as the merge should have been a re-integration- not a range of revisons.
I can't work out why the clients are crashing at the end of the and, of course everyone is deperate to commit a release.
How good would I go if we restored from backup without the problem revisions?
i.e.
- Mark the trunk folder (where the bad commits happened) Read Only.
- From the hot repo, do an
svnadmin dump r80:96 > update_R80_R96.dmp --incremental
This collects all the commits between the time the mirror was updated to just before the bad revisions were committed. The good revisions being r80:96, the bad ones r96:99. - Lock the hot repo to stop anyone making further commits (?)
- Make a final dump file from the hot repo to grab all the latest commits, (excepting the bad ones)
svnadmin dump \path\to\repo -r 100:110 --incremental > update_R100_R110.dmp - On the mirrored repo, load the 2 dumpfiles using svnadmin load
- Take the hot repo offline and rename the hot repo's folder
- Copy the mirrored repo to the same path the hot repo was in
- Start svn and unlock the repo.
Where are the flaws in this plan?
What can I expect when we re-integrate the changes in the branch that were reverted out of trunk?
Many thanks for taking the time to read/comment!