Robin Guest wrote:
> I'm using TortoiseSVN 1.5.4.14259 on XP SP2, for Subversion 1.5.3
> Windows Server 2003.
>
> My repo looks structure looks essentially like this:
>
> -Clients/FooProject/trunk
> -Clients/FooProject/trunk/bin
> +Clients/FooProject/trunk/bin/Bespoke
> -Clients/FooProject/trunk/bin/Bespoke/Foo
> +Clients/FooProject/trunk/bin/Bespoke/Foo/Classes
> +Clients/FooProject/trunk/bin/Bespoke/Foo/Data
> -Common/BarProject/trunk
> +Common/BarProject/trunk/bin
> +Common/BarProject/trunk/bin/Bespoke
> -Common/BarProject/trunk/bin/Bespoke/Bar
> +Common/BarProject/trunk/bin/Bespoke/Bar/Classes
> +Common/BarProject/trunk/bin/Bespoke/Bar/Data
>
> Those directories containing files are prefixed with "+" in my
> example, while empty ones are prefixed with "-".
>
> In the repo, "Clients/FooProject/trunk" contains an svn:externals
> property, created inTortoiseSVN, which reads:
>
> bin svn://192.168.0.4/Common/BarProject/trunk/bin
> bin\Bespoke svn://192.168.0.4/Common/BarProject/trunk/bin/Bespoke
> bin\Bespoke\Bar svn://192.168.0.4/Common/BarProject/trunk/bin/Bespoke/Bar
> bin\Bespoke\Bar\Classes svn://192.168.0.4/Common/BarProject/trunk/bin/Bespoke/Bar/Classes
> bin\Bespoke\Bar\Data svn://192.168.0.4/Common/BarProject/trunk/bin/Bespoke/Bar/Data
>
> My intention is to merge the latest version of "Common/BarProject/
> trunk/bin" into "Clients/FooProject/trunk/bin" recursively all the way
> down the tree.
>
> This reflects the fact that BarProject is a common project that must
> be deployed alongside every different client project.
>
> It is worth noting that everything below "bin" is constrained to be in
> a certain directory structure by the application under development. In
> particular, "Bespoke" always contains a set of files from both the
> client project and the common project. In this example, 6 x Foo.* and
> 6 x Bar.* files, making 12 distinct files in the same directory.
>
> When I check out "Common/BarProject/trunk" to "C:\test" in
> TortoiseSVN, I get the following message:
>
> Command: Checkout from svn://192.168.0.4/Common/BarProject/trunk,
> revision HEAD, Fully recursive, Externals included
> Added: C:\test
> Added: C:\test\bin
> Added: C:\test\bin\Bespoke
> Added: C:\test\bin\Bespoke\foo.dbc
> Added: C:\test\bin\Bespoke\foo.fpt
> Added: C:\test\bin\Bespoke\foo.dct
> Added: C:\test\bin\Bespoke\foo.dbf
> Added: C:\test\bin\Bespoke\foo.cdx
> Added: C:\test\bin\Bespoke\foo.dcx
> Added: C:\test\bin\Bespoke\Foo
> Added: C:\test\bin\Bespoke\Foo\Classes
> Added: C:\test\bin\Bespoke\Foo\Classes\foo.fpt
> External: C:\test\bin
> Error: Working copy 'C:\test\bin' locked
> Error: Please execute the "Cleanup" command.
> Finished!:
You have a versioned folder named c:\test\bin, but you also have an
external folder c:\test\bin. That's not possible, that's why you get
that error.
You have to put your externals in a subfolder of a versioned folder.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-10-23 20:55:17 CEST