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

Re: [Subclipse-users] CollabNet merge tool on Subclipse 1.6, Eclipse 3.5 OS X Carbon, javaHL

From: Mark Phippard <markphip_at_gmail.com>
Date: Sat, 4 Jul 2009 12:42:37 -0400

On Sat, Jul 4, 2009 at 12:08 PM, Bradley
Wagner<bradley.wagner_at_hannonhill.com> wrote:
>> This is normal SVN merge behavior.  Looks like you are going to have
>> fun when you upgrade :)
>> You probably have a ton of files that have acquired the svn:mergeinfo
>> property.  Probably empty.  Probably created by copying/renaming
>> files.  SVN 1.5.6 made changes to stop doing this.  You should
>> systematically remove all occurrences of that property in your
>> repository ASAP, and make sure no one is using earlier 1.5.x clients.
> Do you have any suggestions on how to do this across an entire repository? I
> just did this for my working copy trunk using "svn -R propdel svn:mergeinfo"
> but I figured there is a probably away to do it to the entire repository in
> one swoop.
> I looked at doing it by passing the repos url to the propdel command but
> this apparently is an unversioned property change? I'm not familiar with
> this concept, but I do know that I'd like to be able to see in our version
> history that I deleted all these properties.

These are versioned properties, they can only be deleted with a
working copy. I wouldn't worry about deleting them from tags and
other places where you are not making changes. Just trunk and active
branches. If you get a list of location that have the property,
perhaps you can use svn checkout --depth=empty to check out those
locations and remove the properties? For files, you'd need to
checkout the parent folder with depth=files.

Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-07-04 18:42:49 CEST

This is an archived mail posted to the Subclipse Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.