[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: jcompagner <jcompagner_at_gmail.com>
Date: Thu, 4 Dec 2008 17:53:09 +0100

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

johan

On Thu, Dec 4, 2008 at 17:47, Mark Phippard <markphip_at_gmail.com> wrote:

> On Thu, Dec 4, 2008 at 10:39 AM, jcompagner <jcompagner_at_gmail.com> wrote:
>
> > So every file that has that property will be updated everytime i do a
> merge
> > even on the root?
>
> Yes.
>
> > So if i say merge the project and like: trunk/myproject ->
> branchx/myproject
> > then the merge info of the project is ofcourse set/updated
> > But also all the files in that project that have the mergeinfo property?
> > Even if they are not touched not changed in this specific merge?
> > Why is that?
>
> If it does not update it then it does not know that you merged that
> revision and it would have to check for it again in the future.
> Otherwise it would not be able to tell the difference from when you
> merged to the entire tree or just a part of the tree. For a single
> revision merge like your example it is less of a concern as you are
> unlikely to merge that single revision again. But imagine doing a
> synch up merge. If it does not update the mergeinfo for the ranges it
> processed then everytime you do a synch up merge it would have to go
> reprocess all of those ranges to see if there were any changes for
> those files in that range.
>
> By processing the files it is also able to compact and collapse the
> revision ranges to remove gaps. Again, if it did not do that then
> when you merged a range later it would have to check each gap for each
> file which potentially increases the network turnarounds.
>
> Anyway, it is conversation better had on the Subversion lists as it is
> not related to Subclipse.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=979714
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subclipse.tigris.org].
>

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=979722

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2008-12-04 17:53:23 CET

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