Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: [Subclipse-users] weird merging behavior

subclipse
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

Re: [Subclipse-users] weird merging behavior

Author "Mark Phippard" <markphip at gmail dot com>
Full name "Mark Phippard" <markphip at gmail dot com>
Date 2008-12-04 06:06:57 PST
Message On Thu, Dec 4, 2008 at 9:02 AM, jcompagner <jcompagner at gmail dot com> wrote:

> i have trunk and a branch and i merge (currently using the merge client)
> back and forward between the 2
>
> now i just merged something
>
> merge -c 22469
> https://subversion.s​ervoy.com/developmen​t/branches/v41x_bran​ch/j2db
> F:/workspace/j2db
> --- Merging r22468 through r22469 into F:/workspace/j2db
> C
> F:/workspace/j2db/sr​c/com/servoy/j2db/se​rver/servlets/Config​Servlet.java
> Merge complete.
> ===== File Statistics: =====
> Conflicts: 1
>
> This has a conflict, but that doesnt matter, only 1 file is merged/touched.
> Also the merge results dialog is telling me that
>
> But then when i look what files are changed then there are 5 other files
> also seen as outgoing changes (but compare doesnt show any changes)
> those are always the same 5 files over 3 dirs.
>
> Even stranger is, this happens on both sides. So if i merge from
> branch->trunk it happens but also from trunk->branch
>
> What could that be? Who does touch those files?

Most likely merge has touched the svn:mergeinfo property on those
files. Property changes do not distinguish themselves in the
Synchronize view nor do they show in the Compare UI. I believe the
commit dialog now adds a decorator for them though.

When you do a merge any files that have mergeinfo will have that
mergeinfo updated to reflect that the revision has been merged. No
one likes it. Changes are coming which will reduce the situations
where files have this mergeinfo property, but those that do will
continue to be updated.

If you have done all of your merging on the roots of your project
tree, then it is likely safe to just remove the svn:mergeinfo property
from these files. You will need to do it in your trunk and branches.

--
Thanks

Mark Phippard
http://markphip.blogspot.com/

« Previous message in topic | 2 of 6 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
[Subclipse-users] weird merging behavior jcompagner jcompagner 2008-12-04 06:02:38 PST
     Re: [Subclipse-users] weird merging behavior "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-04 06:06:57 PST
         Re: [Subclipse-users] weird merging behavior jcompagner jcompagner 2008-12-04 07:39:18 PST
             Re: [Subclipse-users] weird merging behavior "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-04 08:47:24 PST
                 Re: [Subclipse-users] weird merging behavior jcompagner jcompagner 2008-12-04 08:53:11 PST
                     Re: [Subclipse-users] weird merging behavior "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-04 08:59:35 PST
Messages per page: