Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > "bogus" merginfo

subversion
Discussion topic

Back to topic list

"bogus" merginfo

Author martin at hmailserver dot com
Full name martin at hmailserver dot com
Date 2009-04-23 14:51:53 PDT
Message 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

« Previous message in topic | 1 of 3 | Next message in topic »

Messages

Show all messages in topic

"bogus" merginfo martin at hmailserver dot com martin at hmailserver dot com 2009-04-23 14:51:53 PDT
     Re: "bogus" merginfo tylermr Tyler Roscoe 2009-04-23 15:18:28 PDT
     Re: "bogus" merginfo tinu44 Martin Bischoff 2009-04-23 15:33:03 PDT
Messages per page: