You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by we...@tigris.org on 2009/04/03 09:34:56 UTC
Files allways in state modified after merging.
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
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1530649
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Files allways in state modified after merging.
Posted by Andy Levy <an...@gmail.com>.
On Fri, Apr 3, 2009 at 05:34, <we...@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@subversion.tigris.org].
RE: Files allways in state modified after merging.
Posted by Bob Archer <bo...@amsi.com>.
Is it possible you have merges from version prior to svn 1.5? Are you
not specifying the merge range?
If the above two are true then merge will try to merge in revisions that
you have already merged because it doesn't know that they were merged.
You can use the --record only option to update your project and tell svn
what revisions you already manually merged.
BOb
> -----Original Message-----
> From: webpost@tigris.org [mailto:webpost@tigris.org]
> Sent: Friday, April 03, 2009 5:35 AM
> To: users@subversion.tigris.org
> Subject: Files allways in state modified after merging.
>
> 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
>
> ------------------------------------------------------
>
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageI
d=
> 1530649
>
> To unsubscribe from this discussion, e-mail: [users-
> unsubscribe@subversion.tigris.org].
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1532990
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].