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

Re: merging into locally added files

From: Paul Burba <ptburba_at_gmail.com>
Date: Mon, 23 Aug 2010 13:41:57 -0400

On Mon, Aug 23, 2010 at 12:35 PM, Stefan Sperling <stsp_at_elego.de> wrote:

> One more question: In case a file/directory has been copied, does that
> affect its implicit mergeinfo in any way?

Definitely, a copy *has* implicit mergeinfo, whereas a local addition has none.

Think of it like this:

Do a URL-to-WC copy of Subersion's own trunk_at_988208 to some-branch-wc.

If we tried this...

  svn merge -c988175 ^/subversion/trunk_at_HEAD some-branch-wc

...we wouldn't expect r988175 to be merged to the working copy.
Because '/subversion/trunk:988175' is not contained in the copied
target's explicit/inherited mergeinfo, it is the target's implicit
mergeinfo that prevents this.

> If so, we should probably make
> the code I added to get_full_mergeinfo() handle copies differently
> than locally added items.

It doesn't appear that anything needs to be done,
svn_client__derive_location() handles the case where ABSPATH_OR_URL is
a copy, and returns the copy-from URL, not an error. So your change
in r988188 has no effect in this case.

Paul

> Stefan
Received on 2010-08-23 19:42:33 CEST

This is an archived mail posted to the Subversion Dev mailing list.