[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: It's time to fix Subversion Merge

From: Geoff Rowell <geoff.rowell_at_gmail.com>
Date: Tue, 12 Jul 2011 13:53:30 -0400

On Jul 12, 2011, at 12:34 PM, Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
> Why can't you --- as Paul already said --- just enforce a policy "Don't
> do subtree merges"?
>
>> If newmerge is successful and we want people to
>> move to it, we can force the conversion by asking "svn" to read the
>> old merginfo and write some information into the new format.
>
> And rewriting of the mergeinfo throughout the repository's history?

I implemented this as a pre-commit hook script, then manually cleaned up the mergeinfo. That solved it for my users.

-Geoff
Received on 2011-07-12 19:54:14 CEST

This is an archived mail posted to the Subversion Dev mailing list.