On Fri, Apr 10, 2009 at 9:21 AM, Paul Burba <ptburba_at_gmail.com> wrote:
> 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...
Ugh, a lot of analysis for such a simple fix! But fixed it is,
r37169. Now if we update --set-depth a WC which has shallow
subtrees, those subtrees get added and get their depths properly set
to infinity.
Paul
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1635447
Received on 2009-04-10 22:26:07 CEST