On 4/7/2012 12:07 PM, Daniel James wrote:
On 7 April 2012 17:25, Eric Niebler <eric@boostpro.com> wrote:
Daniel, is there any way to clean up the merge info Boost-wide and bring these stray files back into the fold?
The merge data in a directory can be removed with:
svn propdel -q -R svn:mergeinfo directory
But that can knock out tracking data that someone is actually using, so that when they next try to merge it will reapply revisions that have already been merged.
I was thinking of something a little more finessed. :-) For instance, if changelist N only touches one file, and I merge that change to that one file (instead of doing it at the root), the results *should* be the same, right? But it sounds like they're not. The mergeinfo forks, in a sense. There should be a way to automatically detect and fix up these sorts of pointless mergeinfo forks. But whatever. Can we just move to git, please? ;-) -- Eric Niebler BoostPro Computing http://www.boostpro.com