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

Re: SVN always thinks a few certain files need to be merged

From: Pat Farrell <pfarrell_at_pfarrell.com>
Date: Wed, 23 Mar 2011 18:36:23 -0400

>> Since then, these files are picked up for properties merges whenever I merge
>> their project even though they haven't really changed in years. How can I
>> FIX this merge info so I stop being bothered by them.
>
> Wouldn't "svn revert filename" clear this? Or did you want to keep your changes?

Nope. I've had the same problem for at least a year. I think it was
caused by a bug in the implementation of "merge info" back in 1.5 days.

For me, the file in question has not been modified in at least a year.
Yet every time I do anything to other files, it is marked as updated.

I have no idea how to fix it, but I sure would want to find a solution.

-- 
Pat Farrell
http://www.pfarrell.com/
Received on 2011-03-23 23:37:03 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.