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

Re: spurious mergeinfo property created on copy?

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-10-09 18:41:19 CEST

On 10/9/07, Malcolm Rowe <malcolm-svn-dev@farside.org.uk> wrote:
> On Tue, Oct 09, 2007 at 09:44:38AM -0500, Ben Collins-Sussman wrote:
> > I asked about this behavior in IRC, and no-one's quite sure if this is
> > a bug or not:
> >
> > $ svn cp README README2
> >
> > $ svn pl -v README2
> > Properties on 'README2':
> > svn:keywords : LastChangedDate
> > svn:mergeinfo :
> > svn:eol-style : native
> >
> >
> > Notice that the copy created an (empty) svn:mergeinfo property. Is
> > this expected?
> >
> Even if this does turn out expected, it seems like a bad idea. There's
> no reason we should be creating empty-valued properties willy-nilly like
> this.

I thought that at first too, but then I remembered there was a reason
that Dan sets this empty property. It has significance in the context
of merge tracking. I think if we do not set the property then the
mergeinfo just becomes inherited from some parent which could be
completely incorrect. This break the inheritance and causes the merge
engine to look at this item separate from the inherited mergeinfo.

The best solution is ultimately to find a way to set the mergeinfo
without requiring the server connection. There are several workable
ideas, but none of them can be implemented very quickly.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 9 18:51:27 2007

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.