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

On Mar 23, 2011, at 7:52 PM, Pat Farrell wrote:

> On 03/23/2011 08:34 PM, Konstantin Kolinko wrote:
>> You are not giving much specifics, so how can people know what is going on
>> in your case?
>
> Specifics for complete 100% reproducable problem:
>
> do svn update for whole project
> create branch from trunk
> change one source file, not the one with the bogus mergeinfo, commit it.
> merge branch back to trunk
>
> before you commit the trunk, do a svn status
> You will see the bogus mergeinfo listed as a change to the trunk.

If you're sure that the mergeinfo is bogus, why not just delete it?
e.g., svn propdel svn:mergeinfo fnfapp/src/java/com/fnfbook/bean/FilterListBase.java

http://www.collab.net/community/subversion/articles/merge-info.html might be worth a read too.

-- 
Name: Dave Huang         |  Mammal, mammal / their names are called /
INet: khym_at_azeotrope.org |  they raise a paw / the bat, the cat /
FurryMUCK: Dahan         |  dolphin and dog / koala bear and hog -- TMBG
Dahan: Hani G Y+C 35 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F- Q+++ P+ B+ PA+ PL++