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

Re: Symmetric Merge -- Wiki page

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 1 Mar 2012 12:31:09 +0000 (GMT)

Stefan Sperling wrote:

> Julian Foad wrote:
>> <http://wiki.apache.org/subversion/SymmetricMerge>
>>
>> How much of what I've written makes sense?á I know it could do with
>> much more detailed worked examples, with concrete Subversion commands
>> and output to prove the connection between theory and practice.
>
> I've just reread it and I really like what you've written.
>
> I'm very happy to see this result. It is a great answer to the seemingly
> fruitless discussions about the weaknesses of Subversion's merge feature
> during the past year. While I am still afraid of unforeseen issues we
> might face when trying to move forward with this proposal, it definitely
> points us into a much better direction than the status quo and is
> worth pursuing.
>
> My only question would be when will you try to work out the detailed
> algorithm to find a good merge base so we can try to implement this? :)
>
> It seems to be a rather simple change on the surface. I'd love to see
> --reintegrate become obsolete in 1.8. But maybe we will need more time
> to get it working?

Thanks for reading and for the encouragement.á I'll continue right away (except I'm on leave tomorrow and Monday), and it seems to me that it should be possible for 1.8.

- Julian
Received on 2012-03-01 13:31:48 CET

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