RE: [ros-svn] [gvg] 19303: Wine-0_9_1 vendor import

[Ge van Geldorp]

> From: [e-mail]
>
> Wine-0_9_1 vendor import

"svn update" will probably fail, you'll need to delete lib\dplay +
lib\dplayx and do a second "svn update". Sorry about this, there seems to be
no way around it.

GvG

[TwoTailedFox]

Hmm. Tortoise SVN correctly deletes dplay, and dplayx, and then
re-creates the directories, and downloads all the files therein.

On 11/17/05, Ge van Geldorp [e-mail] wrote:
> > From: [e-mail]
> >
> > Wine-0_9_1 vendor import
>
> "svn update" will probably fail, you'll need to delete lib\dplay +
> lib\dplayx and do a second "svn update". Sorry about this, there seems to be
> no way around it.
>
> GvG
>
> Ros-dev mailing list
> [e-mail]
> http://www.reactos.org/mailman/listinfo/ros-dev

--
"I had a handle on life, but then it broke"

[Ge van Geldorp]

> From: TwoTailedFox
>
> Hmm. Tortoise SVN correctly deletes dplay, and dplayx, and 
> then re-creates the directories, and downloads all the files therein.

Ok, cool. I think the command line client does have problems.
Same applies to lib/crypt32

GvG

[Casper Hornstrup]

> -----Original Message-----
> From: [e-mail] [mailto:[e-mail]] On Behalf Of Ge van Geldorp
> Sent: 17. november 2005 22:04
> To: 'ReactOS Development List'
> Subject: RE: [ros-dev] [gvg] 19303: Wine-0_9_1 vendor import
> > From: TwoTailedFox
> >
> > Hmm. Tortoise SVN correctly deletes dplay, and dplayx, and
> > then re-creates the directories, and downloads all the files therein.
>
> Ok, cool. I think the command line client does have problems.
> Same applies to lib/crypt32
>
> GvG

It is likely that you have a modified working copy. The problem is documented here:
http://www.reactos.org/wiki/index.php/Subversion#Svn_update_says:_object_wit...

Casper

[Ge van Geldorp]

> From: Casper Hornstrup
>
> It is likely that you have a modified working copy. The 
> problem is documented here:

http://www.reactos.org/wiki/index.php/Subversion#Svn_update_says:_object_wit
h_the_same_name_already_exists
> From: Thomas Weidenmueller
>
> This only works if the directory to be deleted doesn't 
> contain modified versioned files or additional 
> files/directories (such as GNUmakefile etc).

Ahhh, thanks guys. It's probably GNUmakefile in my case.

Ge van Geldorp.

[Thomas Weidenmueller]

Ge van Geldorp wrote:
> Ok, cool. I think the command line client does have problems.
> Same applies to lib/crypt32

This only works if the directory to be deleted doesn't contain modified
versioned files or additional files/directories (such as GNUmakefile etc).

- Thomas