As heavy users of sparse checkouts and merging, my users and I get bit by
this confusion all the time. Users either don't understand why something
they expected isn't getting merged in or they think they have merged
everything but in fact they merged incompletely because of their sparse
checkout.
I would very much appreciate it if the default were changed to 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?
>
> Paul
>
> ------------------------------------------------------
>
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1614711
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1615121
Received on 2009-04-09 22:08:10 CEST