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

Re: svn commit: r1331447 - in /subversion/trunk/subversion:

From: Greg Stein <gstein_at_gmail.com>
Date: Fri, 27 Apr 2012 12:06:40 -0400

On Fri, Apr 27, 2012 at 10:55, Bert Huijben <bert_at_vmoo.com> wrote:
>...
> This doesn't document the behavior of replacements within copies, nor
> with multi layer operations. And I would avoid the wc1 'revert base' as
> that can relate to op depth 0 or higher.

I think it does. It says local-add (whether that is after deleting a
copy/move-here node or not) will return INVALID_REVNUM/NULL.

For any copy/move-here (no matter how deep), it returns the original
of that node.

For simple changes or a local-delete it returns BASE.

For deletions within a copy/move-here, it returns the origin again.

> The behavior talks about where it will be committed to and about where
> things are copied from for op-depth > 0, so personally I would have
> left the 'badly defined' comment as it sounds like the old URL field in
> svn_wc_entry

Hmm? I see it talking about "what is being used as the pristine for
this node?" (which might be a better name)

That's why I used it in client/ra.c: get the pristine info for a given path.

Cheers,
-g
Received on 2012-04-27 18:07:13 CEST

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.