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

Re: Merge policies

From: Stefan Fuhrmann <eqfox_at_web.de>
Date: Sun, 22 Apr 2012 19:41:48 +0200

Branko Čibej wrote:
> On 20.04.2012 23:45, Stefan Fuhrmann wrote:
>> We could even be more permissive: as long as the merge
>> does not cross "switch boundaries" (switched / non-
>> switched or switched to different URL) as may allow
>> the merge.
>> This could be a somewhat typical use-case for people
>> using switched WCs. I would expect that these users
>> want to merge into those sub-trees just like they
>> would also 'svn up' them.
> Doesn't merging in a switched subtree almost by definition imply
> creating subtree mergeinfo? I was under the impression that we wanted to
> more or less forbid such merges at some point in the future.

If the merge does not cross "switch boundaries",
at least in theory, we could record the merge info
at the respective branches' merge info. I understand
that the respective node is not readily available
but the problem is not entirely unsolvable.

-- Stefan^2.
Received on 2012-04-22 19:42:25 CEST

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