Merging and Sparse Checkouts

[SIDOS Joel]

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

 

[Stefan Küng]

SIDOS Joel wrote:

> 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

Use "working copy" as the merge depth.

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

The depth "working copy" means that the depth for each folder is taken
from the depth you checked your working copy out.

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

[SIDOS Joel]

I agree with you about the "working copy" depth.
Also, I try to merge with the "Fully Recursive" option.
But my problem is : "the test merge" interface doesn't give my same results than the real merge operation.
The "real merge operation" seems to be ok, but the "test merge" gives me some
Is this problem known ?

Second question please : how can I have a working copy with sparse checkout subdirectories and all my externals ?
I would obtain :
MyBranch (Only this item) (Mybranche has svn:externals with External1 ... External2)
|_ Rep1 (Fully recursive)
|_ External 1
|_ External 2

Thanks for your answers

-----Message d'origine-----
De : Stefan Küng [mailto:torto...@gmail.com]
Envoyé : mercredi 15 octobre 2008 18:40
À : us...@tortoisesvn.tigris.org
Objet : Re: Merging and Sparse Checkouts

[Stefan Küng]

SIDOS Joel wrote:
> I agree with you about the "working copy" depth.
> Also, I try to merge with the "Fully Recursive" option.
> But my problem is : "the test merge" interface doesn't give my same results than the real merge operation.
> The "real merge operation" seems to be ok, but the "test merge" gives me some
> Is this problem known ?

Yes. See, the test merge doesn't actually do the merge, so it has to do
a lot of guessing about the merge outcome, and that guessing is not
always a 100% accurate.

> Second question please : how can I have a working copy with sparse checkout subdirectories and all my externals ?
> I would obtain :
> MyBranch (Only this item) (Mybranche has svn:externals with External1 ... External2)
> |_ Rep1 (Fully recursive)
> |_ External 1
> |_ External 2

checkout MyBranch with "immediate children, including folders".
Otherwise you won't get the externals.

[SIDOS Joel]

Thanks for your answers.
Unfortunately, your answer about my "externals" question seems not working.
I tried the extraction with "immediate children, including folders" with 2 differents clients :
- 1.5.3.13783 which is our production version
- 1.5.4.14259 for test
The result is the same in those two cases :
MyBranch (immediate children, including folders)
|_ Rep1 (empty)
|_ Rep2 (empty)
But no external subdirectories.

Regards

-----Message d'origine-----
De : Stefan Küng [mailto:torto...@gmail.com]

Envoyé : vendredi 17 octobre 2008 13:09

À : us...@tortoisesvn.tigris.org
Objet : Re: Merging and Sparse Checkouts

[Stefan Küng]

SIDOS Joel wrote:
> Thanks for your answers.
> Unfortunately, your answer about my "externals" question seems not working.
> I tried the extraction with "immediate children, including folders" with 2 differents clients :
> - 1.5.3.13783 which is our production version
> - 1.5.4.14259 for test
> The result is the same in those two cases :
> MyBranch (immediate children, including folders)
> |_ Rep1 (empty)
> |_ Rep2 (empty)
> But no external subdirectories.

Just tried this myself: you're right. But IMHO it should get the
externals too.
Can you report this on the Subversion mailing list please?