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

Re: Merge bug? or I am missing something...

From: Brian Gideon <briangideon_at_yahoo.com>
Date: Wed, 8 Apr 2009 06:58:14 -0700 (PDT)

Yes, the issue has been fixed. It was fixed in one of the 1.5.x
releases.

The easiest way to remove those svn:mergeinfo properties is to first
add it to each child folder and file under the root and then remove
them recursively. That works well if you have only a few folders
underneath the root folder. That also assumes that your were doing
all branching/merging at the root level. Just be careful not to muck
with the property at the root level.

On Apr 3, 12:25 pm, webp..._at_tigris.org wrote:
> Has this issue gone away in more recent releases?
>
> I've noticed the issue with the svn:mergeinfo properties being set on WC rename operations through TortoiseSVN, but unfortunately like many others I noticed this too late and now have to deal with all the noise during subsequent merge operations.
>
> After testing a a bit with TortoiseSVN 1.6 without doing an actual commit it doesn't appear that the svn:mergeinfo property is being set on rename in my working copy. I'm assuming this means that the issue has been addressed.
>
> For now I'm planning on removing all of the useless svn:mergeinfo properties that were added in by accident in the past and hope that this issue will be history after that. Anybody see a problem with this approach? I'd hate to remove these properties and get further issues because of it.
>
> ------------------------------------------------------http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMess...
>
> To unsubscribe from this discussion, e-mail: [users-unsubscr..._at_tortoisesvn.tigris.org].

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1596768

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-08 16:00:04 CEST

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