[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: Konstantin Kolinko <knst.kolinko_at_gmail.com>
Date: Thu, 24 Mar 2011 06:23:53 +0300

2011/3/24 David Huang <khym_at_azeotrope.org>:
>
> 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.

+1

Also this article, "Where Did That Mergeinfo Come From?"
http://blogs.collab.net/subversion/2009/11/where-did-that-mergeinfo-come-from/

Best regards,
Konstantin Kolinko
Received on 2011-03-24 04:24:31 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.