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

Re: Merge tracking proposal

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-04-28 20:41:22 CEST

On 4/28/06, C. Michael Pilato <cmpilato@collab.net> wrote:
> Greg Hudson wrote:
> > On Fri, 2006-04-28 at 09:34 -0700, Daniel Berlin wrote:
> >
> >>2. If the merge target is a non-wc-root directory, the merge info goes
> >>to the property SVN_MERGE_INFO set on the directory
> >>3. If the merge target is a wc-root directory, the merge info goes to
> >>the property SVN_MERGE_INFO set on the revprop.
> >
> > What's a wc-root directory?
>
> We've used for a long time the terminology "working copy root", which is
> essentially a working copy directory whose on-disk parent directory is not
> also its versioned paths-as-they-are-in-the-repos parent. See the docstring
> for update_editor.c:check_wc_root().

See, that's not all that check_wc_root() looks for though. For
example, the current working directory is always considered to be a
working copy root by that function.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 28 20:41:52 2006

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.