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
