Re: Reintegrate merge and other SVN 1.5 issues

Hi Stefan,

Thanks a lot for your fast reply.

First, I was happy to find out that sparse checkout is fully supported by Tortoise.

I want to confirm with you my understandings from your reply (and previous threads you wrote):

1. If i work in branch reuse mode (repeating merges between trunk and branch) i should use the "Merge range of revisions" option and leave the revisions selection blank.
2. About "mergeinfo" change in inner folders. I understand that It's something that can't be avoid in version 1.5. You have to commit or revert it. And it's going to be reduced in version 1.6.
Is there any way (that i missed) that can help filter these modifications out from "check for modifications" or something else?
Also, if some people commit the changes and other revert, isn't it going to cause a lot of conflicts in merges on these properties?

Thanks,
Golan

----- Original Message ----
From: Stefan Kueng <tortoisesvn_at_gmail.com>
To: users_at_tortoisesvn.tigris.org
Sent: Friday, December 5, 2008 1:07:00 PM
Subject: Re: Reintegrate merge and other SVN 1.5 issues

golan davidovits wrote:
> Hi,
>
> I'm trying to understand the right "Reintegrate" usage model,
> currently i find it very difficult to use.
>
> In SVN 1.4 we selected range of revisions from log and wrote the
> merge info manually in the log (Always did trunk->branch merge before
> branch->trunk merge).
>
> After moving to SVN 1.5 , We adjusted the methodology as follows:
>
> trunk->branch merge:
>
> 1. First trunk->branch merge of 1.4 branch is done with range of
> revisions (for mergeinfo initialization). 2. Following trunk->branch
> merges with range of revisions without specifying revisions.
>
> branch->trunk merge
>
> 1. First branch->trunk merge of 1.4 branch is done with range of
> revisions (for mergeinfo initialization). 2. Following branch->trunk
> merges with reintegrate.

'reintegrate' merges are meant to re-integrate a branch to trunk after
the branch work is finished. Multiple 'reintegrate' merges won't work.

> Problems: 1. Reintegrate usually fails due to "not all revisions on
> target branch were merged". Similar merge with merge of revisions
> works. * I see this behavior also on new branches which were created
> with SVN 1.5 (although the trunk was created on 1.4).

as mentioned above: reintegrate is meant to be only used once, not
repeatedly.
You can use the normal merge and just specify the full merge range every
time.

> 2. I expected to maintain mergeinfo only on the branch top level
> folder, but in time i see that properties are changed also on inner
> folders due to rename, move etc. It makes the reintegrate even less
> functional (and you can't rely on users to do selective check-in of
> properties).

This was mentioned now several times, and I've explained it also several
times. Search the mailing list.

> 3. This is an Error which i have mentioned in previous thread with no
> resolution. I see it many times after trying to commit merge: "can't
> open .svn\tmp\tempfile.tmp: access is denied" Sometimes, when i look
> at .svn\tmp\ i don't' see tempfile.tmp file but tempfile3.tmp, Just
> as a test: If i try to rename the file to tempfile.tmp, the error
> changes to can't find tempfile2.tmp....

Disable your virus scanner for working copies.

> 4. In some repositories we want to use sparse checkouts. It would be
> much better if user could select a folder from the file system tree
> and Tortoise will automatically build all the way from top folder
> (which includes mergeinfo) till the target folder. Now user must do
> multiple checkouts, and if the target folder is deep, it's very
> uncomfortable. In addition, i understand that sparse checkouts and
> reintegrate are contradict.

* Check out root folder, with depth set to "only this item".
* right click on that wc folder, choose "repository browser"
* in the repo-browser, select the folder you need (doesn't matter how
deep down in the tree it is), right-click, choose "update to revision".

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
(_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\    http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=980027
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=980066
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].