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

Re: Merging with sparse checkouts

From: Kari Granö <kari.grano_at_gmail.com>
Date: Thu, 19 Mar 2009 22:43:36 +0200

Kari Granö wrote:
> If I merge r15744-15745 from
> http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk to my (sparse) working

> copy of of
> http://tortoisesvn.tigris.org/svn/tortoisesvn/branches/1.6.x@15743 using
> depth="working copy", I get
> (1) No text changes at all
> (2) Mergeinfo of /trunk gets added to all sparse subtrees of my WC

What "--depth" flag does the TSVN GUI value "working copy" correspond to?
I'm getting the above behavior with svn.exe if I run the command

svn merge -r15743:15745 http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk

However, when I pass "--depth=infinity", the merge works correctly. So it
seems to me like the CLI merge is not respecting working copy depth.

With TSVN, the "working copy depth" is not doing what is says for merges
within sparse working copies. I'm not sure how this should be fixed. Could
TSVN analyze the target directory and pass the equivalent of
"--depth=infinity" to SVN libraries if the target is sparse?

See the CLI discussion thread at
http://svn.haxx.se/users/archive-2009-03/0493.shtml for discussion about my
CLI efforts. There's also a reproduction recipe that is faster to run than
the above case.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-03-19 21:45:31 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.