That is one option.
The other option is creating a maintenance branch from the old revision,
where things were still ok (e.g. right before the reintegrate) and then
merging the changes from trunk to the branch that you want to keep.
It really depends on whether you want to have 'trunk' to
Thanks for confirming that Bert. I'd prefer to keep the trunk stable so I've
recommended the reverse merge approach.
From: Bert Huijben [mailto:b...@qqmail.nl]
Sent: 25 February 2014 10:38
To: James French; users@subversion.apache.org
Subject: RE: separating out unwanted changes
That is one
