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

Problem with merge

From: Robert Dailey <rcdailey_at_gmail.com>
Date: Mon, 21 Jul 2008 13:18:00 -0500

Hi,

I'm currently using TortoiseSVN 1.5 and I am noticing a very serious
problem. After I merge a branch of mine into trunk, I notice that the
overlays are showing that folders & files have local modifications when in
fact they do not and should not. The merge process did not touch these
files. When I go to diff the changes, they show up as identical. It will
even allow me to commit these files, even though they have no physical
changes that I can see. This doesn't make any sense to me.

I realize I'm being very vague about this, but I really don't know what else
to say. I'm hoping that this is a known issue and what I've said is enough
to identify the known problem. If not, I suppose I could post to the
subversion group since I'm not sure if this is a TSVN issue or a SVN issue.

Thanks for your time.
Received on 2008-07-21 20:18:20 CEST

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

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