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

Surprising merge results - Mergeinfo Elision?

From: David Aldrich <david.aldrich_at_eu.nec.com>
Date: Wed, 4 Nov 2009 09:12:51 +0000

Hi

I am using a GUI svn client based on SVNkit 1.3.1, which I believe is aligned with svn 1.6.5 approx, and svn server 1.5.2.

I have just merged changes from my project's trunk into my branch and am surprised to see that I have 100 files showing a local state of 'Modified (properties only)'. If I examine the changes I find that the only change on each of these files is that the svn:mergeinfo property has been removed.

I have been told that this may be caused by "Mergeinfo Elision", please will someone explain what may be happening and whether it is expected behaviour?

(I know this forum is concerned with only the svn binaries so I could repeat the operation using only the svn client, but I am expecting that this is not SVNKit specific behaviour).

Any help would be appreciated.

Best regards
David

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2414343

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-11-04 10:14:30 CET

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

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