Re: Merge tracking proposal

On Fri, 2006-04-28 at 11:38 -0700, Daniel Berlin wrote:
> On Fri, 2006-04-28 at 14:32 -0400, 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?
>
> hehe. Apparently people aren't quite aware our wc has a notion of a root
> directory.
>
> See fun functions like svn_wc_is_wc_root.

Yay, i fat fingered send.

So to actually *answer* the question, the wc root is the root of the
commit.

So if you commit a/b/c and a/b/d, your wc root is a/b

It may make more sense to think of it this way:

If the target gets a full, complete, merge, and has all the changes of
the merge, it goes to the revprop.

---------------------------------------------------------------------
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:44:12 2006