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

mergeinfo weirdness

From: Yanroy <ryan.d.meador_at_gmail.com>
Date: Thu, 13 Nov 2008 12:54:45 -0800 (PST)

Hi guys,
I've been using SVN 1.5 for a couple months now and I've seen some strange
things (and complaints from my users). It seems that sometimes when you do
a merge, random files get mergeinfo set on them. I have no idea why...
these files don't seem to have anything to do with the merge. I can't be
100% certain my memory is accurate, but I think I've even seen mergeinfo
getting set on directories outside the one being merged (i.e. parent or
sibling directories). The contents of this mergeinfo is always the path and
rev num that I was merging.

Interestingly, when this happens, usually I DON'T see mergeinfo getting set
on the files that actually were changed as part of the merge! I've observed
this using both Tortoise and the command line client. After committing,
there's no mention of mergeinfo properties on the merged files either, yet
svn log -g will return the logs of the thing that was merged in... AFAIK,
that's impossible if the mergeinfo isn't set.

Is the mergeinfo somehow being hidden? I found a feature request
(http://svn.haxx.se/dev/archive-2008-09/0008.shtml) to hide the mergeinfo
while I was searching for an answer to this problem, and I really, really
want that feature, but I can't seem to figure out if it's in the latest
versions or not. I'm using 1.5.3. If it is in there, it's really buggy.
My users keep complaining about their actual commits getting drowned in
extraneous mergeinfo changes (and it doesn't help that most of them don't
understand what mergeinfo is).

I think we have two problems... one is extra mergeinfo being set when it
shouldn't be, and the other is the thing shows mergeinfo at all. The user's
only interaction with mergeinfo should come from svn log -g and similar
commands that use it (but don't show it directly).

Do you think maybe I'm doing something wrong? My server was running 1.4.x
and was upgraded using svnadmin upgrade. All the clients were upgraded to
1.5 at or before the server upgrade. We're accessing over HTTP with Apache.
Sometimes we get unrelated error messages, like Tortoise's log window asking
if we want to go offline, then poping up a dialog that mentions an error and
also says HTTP 200 OK. Doesn't happen through file:// access, so I've just
chalked that one up as unrelated to the mergeinfo thing, but I thought I'd
let you guys know in case it helps you diagnose my situation. Any help
would be greatly appreciated.

Ryan

-- 
View this message in context: http://www.nabble.com/mergeinfo-weirdness-tp20489287p20489287.html
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-13 21:55:06 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.