[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: Branko Čibej <brane_at_apache.org>
Date: Mon, 05 Mar 2012 10:58:37 +0100

On 27.02.2012 14:15, Julian Foad wrote:
> As many of you are aware I've been looking at improving merge in various ways. I'd like to ask for feedback at this stage on the Wiki page <http://wiki.apache.org/subversion/SymmetricMerge> (renamed from SvnMergeTheory). The essential point is that it looks like we can relatively easily enhance Subversion so that a plain 'merge' command will act as either 'sync' or 'reintegrate' automatically, depending on the history of the branch, and furthermore will work better than either of them in the scenario of continuing work on a branch after a reintegrate.
> 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.

Thanks Julian, this is a very good start. I'm looking forward to the day
when I get a deprecation warning upon using the --reintegrate option :)

-- Brane
Received on 2012-03-05 10:58:46 CET

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