On 03/23/2011 05:36 PM, Pat Farrell wrote:
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.
Exactly.
The files haven't changed in two years. Yet every time I do a merge I
encounter them. And all it's about is "merge info". Isn't there some
way to get the "merge info" right? There MUST BE.
