db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jean T. Anderson" <...@bristowhill.com>
Subject Re: DERBY-1636 patch problem (was Re: [jira] Commented: (DERBY-1636) document encryption of an un-encrypted database and re-encryption with new password/key.)
Date Sat, 26 Aug 2006 03:50:29 GMT
Jean T. Anderson wrote:
...
> ouch, there's an issue with derby1636_devguide4.diff .
...
> The standby trick of doing this:
> 
>    svn up -r 432381
>    patch -p0 -i derby1636_devguide4.diff
>    svn add src/devguide/tdevdvlpcreateencryptdbextkey.dita
>    ... svn add other new files as well ...
>    svn up
> 
> results in this error:
> 
>    svn: Failed to add file
> 'src/devguide/tdevdvlpcreateencryptdbextkey.dita': object of the same
> name already exists
> 
> So it seems like the patch adds a file that maybe got added by a patch
> that was already committed?

btw, this file was added by derby1622_devguide_5.diff for DERBY-1622
revision 433290 on 8/21/05.

 -jean


Mime
View raw message