[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: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2006-04-28 20:40:12 CEST

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().

-- 
C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on Fri Apr 28 20:40:41 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.