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

Re: RFC: Make default depth of merge infinity

From: Paul Burba <ptburba_at_gmail.com>
Date: Fri, 10 Apr 2009 09:21:28 -0400

On Fri, Apr 10, 2009 at 8:42 AM, Bert Huijben <bert_at_qqmail.nl> wrote:
>
>
>> -----Original Message-----
>> From: Mark Phippard [mailto:markphip_at_gmail.com]
>> Sent: donderdag 9 april 2009 16:56
>> To: Paul Burba
>> Cc: dev_at_subversion.tigris.org
>> Subject: Re: RFC: Make default depth of merge infinity
>>
>> On Thu, Apr 9, 2009 at 10:40 AM, Paul Burba <ptburba_at_gmail.com> wrote:
>> > Currently (trunk_at_37129) the default depth of a merge is the depth of
>> > the merge target.  If the target has children that are at a deeper
>> > depth then those children are not merged to.
>> >
>> > For example, say we have this merge target:
>> >
>> >  branch/            (depth == immediates)
>> >  branch/notes/      (depth == empty)
>> >  branch/src/        (depth == infinity)
>> >  branch/README.TXT  (depth N/A)
>> >
>> > If we merge with no depth option specified the merge will not merge
>> > any applicable changes into branch/src/*.
>> >
>> > Several people find this a bit counter-intuitive, and I agree:
>> >
>> > http://svn.haxx.se/dev/archive-2009-03/0701.shtml
>> >
>> > This can be worked around by passing --depth=infinity to the merge
>> > subcommand, but I doubt many users will realize this.
>> >
>> > Also, this is inconsistent with how update works.  In the above
>> > example if we update branch with no --depth or --set-depth option then
>> > branch/src/* would get any available updates.
>> >
>> > I'd like to change merge's default depth to infinity.  Any objections
>> > or thoughts?
>>
>> +1
>
> +1. Please, make it explicit if you don't want to use a recursive merge.

No disagreement, so I made the change in r37156. We still have the
issue Mark mentioned to deal with, but we can deal with that in a
separate thread.

Paul

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1630739
Received on 2009-04-10 15:21:43 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.