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

Re: Merge causing modified flag on every new commit

From: Andy Levy <andy.levy_at_gmail.com>
Date: Mon, 28 Sep 2009 11:14:01 -0400

On Mon, Sep 28, 2009 at 10:46, Whittier, Chris <cwhittier_at_astromed.com> wrote:
> I am encountering an issue with 2 folders that were merged back into my
> trunk from a branch. Now, every file contained in those folders, have merge
> info in their properties, which is fine, but each time a commit is made to
> the trunk, every file in these folders shows up as “properties modified” and
> their merge info is updated. This makes looking up which files were modified
> in a commit sort of difficult.. since these files appear every time, even
> when not modified. The merge info in the properties contains an asterisk
> next to it, where other files with merge info do not. These are the most
> recent folders added to our trunk, not sure if it has to do with an SVN
> update. Can someone tell me how to stop this from happening?

Always specify what version of Subversion you've got on the server and
TSVN on the client.

Most likely this is due to the "spurious mergeinfo" bug in the early
1.5 releases.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2401267

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-28 17:14:32 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.