Re: Identifying branch roots

2011-10-07 Thread Julian Foad
ache.org/subversion/BranchingMergingTerminology>. > > I haven't though this through yet. > > I think your approach of "Branches with the same value of this > > property are mergeable" is a design decision which has a similar > > kind of impact on how a branch-root

Re: Identifying branch roots

2011-10-07 Thread C. Michael Pilato
On 10/07/2011 06:59 AM, Julian Foad wrote: >>> I think this is an exciting feature with lots of potential but >>> it has a lot more inherent complexity than improving 'svn mergeinfo' >>> output. Could we split improving the output of 'svn mergeinfo&

Re: Identifying branch roots

2011-10-07 Thread Daniel Shahaf
>>> output. Could we split improving the output of 'svn mergeinfo' and > >>> identifying branch roots into two distinct feature branches? > > > > Splitting it wouldn't work for me, because the branch marker information > > has no purpose and no de

Re: Identifying branch roots

2011-10-07 Thread Julian Foad
C. Michael Pilato wrote: [...] > The thing you are describing is a branch root, so just call it what it is. > ("svn:branch-root" is what I suggested a couple of years ago for this.) [...] I guess, name "svn:branch-root" => value "subversion" can make sense when we get used to the semantics being "

Re: Identifying branch roots

2011-10-10 Thread Trent Nelson
On 07-Oct-11 6:59 AM, Julian Foad wrote: On Fri, 2011-10-07 at 11:29 +0100, Julian Foad wrote: Stefan Sperling wrote: julianfoad wrote: +/* This property marks a branch root. Branches with the same value of this + * property are mergeable. */ +#define SVN_PROP_BRANCHING_ROOT "svn:ignore" /* ##

Identifying branch roots [was: svn commit: r1179135 - in /subversion/branches/showing-merge-info/...]

2011-10-07 Thread Julian Foad
=> svn:mergepolicy on branch root: 'cherry-pick ^/trunk' > > > I haven't though this through yet. > I think your approach of "Branches with the same value of this > property are mergeable" is a design decision which has a similar > kind of impact on how