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

Re: Merging and Sparse Checkouts

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Wed, 15 Oct 2008 18:39:42 +0200

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

Received on 2008-10-15 18:39:59 CEST

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