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

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.

for example:

 svn merge https://www.everythingtiny.com/repos/bbook/branches/pat -r
14135:14147
--- Merging r14146 through r14147 into '.':
U fnflib/src/com/fnfbook/daemon/helpers/MailToBlog.java
pfarrell_at_tools:~/sandbox/bbook/trunk$ svn status
 M .
M fnflib/src/com/fnfbook/daemon/helpers/MailToBlog.java
 M fnfapp/src/java/com/fnfbook/bean/FilterListBase.java

The "FilterListBase" is marked as modified, but it has not been changed
in a year and was not changed in this
edit, only the "MailToBlog.java" file was modified.

-- 
Pat Farrell
http://www.pfarrell.com/