Robert Dailey wrote:
> 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.
When mergint with an 1.5 Subversion client, the property svn:mergeinfo
is set on folders and files, even on ones not directly touched by the
merge. Those svn:mergeinfo properties are important and you should
commit them anyway (or remove *all* before committing - otherwise you'll
confuse Subversion if you only remove some of them).
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-07-21 21:22:28 CEST