db-derby-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Jean T. Anderson" <...@bristowhill.com>
Subject 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 Fri, 25 Aug 2006 23:40:54 GMT
Jean T. Anderson wrote:
> Suresh Thalamati (JIRA) wrote:
>>    [ http://issues.apache.org/jira/browse/DERBY-1636?page=comments#action_12430662
>>Suresh Thalamati commented on DERBY-1636:
>>I reviewed the latest changes , they look good.   Thanks a lot Laura. 
>>+1,   this patch  can be committed. 
> I'll commit this to the trunk and also merge to 10.2 (I noticed that
> Rick did the doc mega merge -- thanks, Rick!)

ouch, there's an issue with derby1636_devguide4.diff . It gets the
"Reversed (or previously applied) patch detected!" error.

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?

Laura, Andrew and I discussed strategies on IRC. We think the best thing
is for you to sync up your own working copy ('svn up'), then regenerate
the patch. You might need to figure out what was added to that file that
wasn't in the patch.

Sorry this one didn't go smoothly. Once we get all the doc patches
caught up we should see fewer of these sorts of problems.


View raw message