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

"bogus" merginfo

From: <martin_at_hmailserver.com>
Date: Thu, 23 Apr 2009 23:51:50 +0200 (W. Europe Daylight Time)

I'm having a problem related to merging. I would appreciate if someone
could confirm whether what I'm seeing is a known bug or not. I've tried to
find an issue report on it, but with no success. There seems to be several
similar reported but no spot on.

(I use TortoiseSVN as client, but the problem is reproducible by using the
SVN CLI as well.)

Whenever I merge a change from /branches/<version> to /trunk, "bogus"
mergeinfo is added to files under /trunk. With "bogus" here, I mean that
mergeinfo is added to files even though they have not been changed in the
revision I'm merging. The effect this has is that when I want to commit my
changes to /trunk, SVN tells me that I have modified files which I have
not touched.

If I commit these files - which doesn't have any "real" changes,
everything will be fine until the next time I merge changes from
/branches/<version> back to trunk. Then they will reappear in the commit
dialog again. It's the same files which reappear as modified every time.

(Of course, I can simply revert the files I know I haven't modified under
/trunk, or I can choose not to commit them. However, since I do this all
the time there's a risk I'll screw up sooner or later and revert the wrong
file. Another boring side effect is that I have to keep in memory which
files I've been changing, something I would like SVN to do for me.)

I'm using SVN 1.6.1 both on server and on client. When the problem started
to occur, I was using an earlier version (1.5.<something>. I'm still
seeing it when using 1.6.1 though. The problem has not started to happen
with 'new' files after the upgrade to 1.6.1, but I upgraded just some day
ago.

One pattern I believe I'm seeing (but I'm not certain) is that it occurs
which files which has been renamed at some point under
/branches/<version>.

Martin

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-24 00:02:31 CEST

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