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

Merging and Sparse Checkouts

From: SIDOS Joel <JSIDOS_at_cegid.fr>
Date: Wed, 15 Oct 2008 10:23:11 +0200

Hi,

Could someone help me about this situation, please ?

I've an "Sparse Checkout"-based working copy of my development branch.

Checkout depths can be explained like this :

 

MyBranch (Only this item)

|_ Rep1 (Only this item)

                               |_ Rep2 (Fully Recursive)

 

My Goal is "Merge all the trunk modifications in my branch"

I try to merge like this :

1. Right Click on "MyBranch"

2. TortoiseSVN/Merge

3. Merge an range of revisions

4. Next : MyTrunk's URL

5. Merge depth : Fully Recursive

6. Test Merge

 

0 modifications in my list

 

If I try to merge like this :

7. Right Click on "MyBranch\Rep1\Rep2"

8. TortoiseSVN/Merge

9. Merge an range of revisions

10. Next : MyTrunk\Rep1\Rep2's URL

11. Merge depth : Working Copy

12. Test Merge

 

N modifications in my list : it works

 

The question is : "Must I merge my Fully Recursive's Subdirectories one by one or is it a real another solution to do this simply"

 

Thanks for your answers

Regards

 
Received on 2008-10-15 10:25:24 CEST

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