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
De¬†: Stefan K√ľng [mailto:tortoisesvn_at_gmail.com]
Envoy√©¬†: mercredi 15 octobre 2008 18:40
Objet¬†: Re: Merging and Sparse Checkouts
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.
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-10-17 10:24:04 CEST