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

Re: [Subclipse-users] weird merging behavior

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 4 Dec 2008 11:59:34 -0500

On Thu, Dec 4, 2008 at 11:53 AM, jcompagner <jcompagner_at_gmail.com> wrote:
> But still in my eyes it is a bit strange
> If i delete the merge info property from that file then it wont add it
> anymore
> and then i guess in further merges it also wouldnt be a problem because else
> subversion would add the property always to all my files
> But because i guess at one point i did a merge really on those files now
> they are updated all the time even if i do it from the root.
> I still find that a bit weird because if i didnt do that and always just
> merge from the root then those properties are not missed at all.
>
> But i will just delete the properties
> thx for explaining

The properties are currently created when you copy/move a file in your
WC. It was done for a reason but we have eventually convinced the
developers the reason was not a good one and starting with 1.6 this
will no longer happen. So the only time you will get properties on
files is when you merge directly to those files. At that point it is
generally correct that the mergeinfo is tracked on the file.
Subversion does have a process whereby this information can be removed
automatically.

For example, suppose you merge revision 123 to a specific file. The
file will have mergeinfo that indicates this.

If you later merge revision 123 to the entire branch, perhaps by doing
a catch-up merge of a big range, then the mergeinfo on the file will
now "elide" to the root as it is no longer different. When merge
tracking was designed this seemed like it would be a common occurrence
and good feature. In practice, it seems to happen less often than
expected.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=979729
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2008-12-04 17:59:43 CET

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