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

Re: merge 2 trees

From: golan davidovits <golandav_at_yahoo.com>
Date: Sun, 21 Dec 2008 01:13:44 -0800 (PST)

Thanks for sending the link, the article indeed discuss the important aspects of the merge process.
It also confirm some of the methodology constraints we impose. I think my questions are still valid though.

- From my experience users do repeating cyclic merges. Delete the branch after first cyclic merge is usually to harsh demand. It eliminates the Reintegrate option for us.
- We impose always doing trunk->branch merge before branch->trunk merge. From the article i understand that 2 tress is indeed a "copy merge". Am i right?
Assuming mergeinfo value is correct, is there a difference between selecting "Range of revisions with blank revisions" to "2 trees"? Looks like 2 trees is more safe since i only need to even trunk to the branch state. Is using the "Range with no revisions" for same action can cause false conflicts?

And last, Any idea about the folder lock please run cleanup problem?


----- Original Message ----
From: Purple Streak <mrpurplestreak_at_googlemail.com>
To: users_at_tortoisesvn.tigris.org
Sent: Sunday, December 21, 2008 9:52:47 AM
Subject: Re: merge 2 trees

2008/12/21 golan davidovits <golandav_at_yahoo.com>:
> Simon, thanks for your comments.
> I do read the documentation before posting the forum, but the difference between the 3 merge options is not clear.
> From previous threads i had in this forum, i got into conclusion that i need to use the "Range of Revisions" merge option with no revisions
> for both "trunk->branch & branch->trunk merges (I understood that using this method will still maintain the mergeifno property).
> Also, i understood that "Reintegrate" is for 1 time only branch->trunk merge which is not good for us since we work in branch reuse mode.
> BTW, i don't really understand what's in this option that makes is good for 1 time merge usage.
> Now, i wanted to realize if we have use case for selecting 2 tress merge. I thought it's a "copy merge" - makes 1 branch WC looks like another branch (just copy the files).
> Considering your reply and assuming we always do trunk->branch merge first, is there any difference between doing "Range with no revisions" merge to "2 trees" merge?
> Also, do you have any suggestion about the error i mentioned?

I was going to write my own reply here - but then I found this blog
post (http://blogs.open.collab.net/svn/2008/07/subversion-merg.html)
which explains it all far better than I could do!


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-21 10:13:52 CET

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