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

Re: Files allways in state modified after merging.

From: Andy Levy <andy.levy_at_gmail.com>
Date: Fri, 3 Apr 2009 09:07:12 -0400

On Fri, Apr 3, 2009 at 05:34, <webpost_at_tigris.org> wrote:
> Hi all,
>
>   A little problem concerning some files in my projects:
>
>   When I merge the branche A over the B, some files which haven't been modified in any revision of these branches appear as modified and force me to commit them to valid the merge.
>
>   Do you have any idea of what can produce this kind of problem.
>
>  Thx.
>
> Subversion 1.5.5
> TortoiseSVN 1.5.7, Build 15182 - 32 Bit , 2009/01/24 22:44:13

The svn:mergeinfo property is being changed. Do the properties show as
modified, or the contents?

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1532152

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-04-03 15:09:07 CEST

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.