On Mon, Mar 2, 2009 at 4:37 AM, <blackhole_at_collab.net> wrote:
> Hi, I'm sorry for disturbing the dev list, but I'm not sure whether I'm seeing a svn bug and how I should proceed.
>
> (I got no answer on the svn-users and TSVN lists: http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1219898):
>
> Short version of the problem: after a first merge from trunk to a feature branch, I have lots of files in my (branch-)working copy where a svn:merginfo property was added. The files have no other change and they were never modified on trunk and branch since the creation of the branch.
Hi Martin,
To clarify: The files in your branch working copy had mergeinfo
*added*, that is no mergeinfo existed on these files before the merge?
Or did they have mergeinfo prior to the merge and this mergeinfo was
changed by the merge? Given that there were no changes on trunk to
these files, the former would be a bug, but the latter is expected.
Currently, if we merge to a WC target X, then we update the mergeinfo
on X as well as all of X's subtrees which also have mergeinfo. There
has been discussion about changing this, but it's not quite so simple
as turning it off.
> How should I proceed to be able to easily reintegrate the branch to trunk in the future:
> - Should I commit the files which have only a property-change to the branch or should I exclude them?
No, commit them. If you exclude them reintegrate won't work because
it will appear that you haven't merged a contiguous block of revisions
from trunk starting from the branch point. You could still perform a
2-URL merge (see
http://blogs.open.collab.net/svn/2008/07/subversion-merg.html) since
that is all --reintegrate is doing under the covers.
Paul
> - Is it a SVN bug, which is solved in a newer version (e.g. in the upcoming 1.6)?
>
> I was using TSVN 1.5.7/1.5.8, based on SVN 1.5.5 on the client and subversion 1.5.4 on the server.
>
> Thanks for your help.
>
> Martin
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1255482
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1256387
Received on 2009-03-02 14:40:46 CET