Reintegrate merge and other SVN 1.5 issues

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.

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).

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).

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....

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.

I would appreciate if you could resolve any of my problems. At this point i'm trying to understand what to change in order to achieve stable methodology with SVN 1.5
I'm thinking of not using reintegrate at all but using only range of revisions merge (with no revisions) for both branch->trunk and trunk->branch merges.
Do you think it's a good direction? Would i get reliable merge results?

Thanks,
gzd

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=979990

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