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: Help! How to revert a doc patch?
Date Sat, 18 Feb 2006 19:48:07 GMT
Jean T. Anderson wrote:
> I applied the wrong patch for DERBY-855 (Eric, the way you labelled
> patches was perfectly fine -- my eyeballs just dropped down one line).
> 
> But now I'm having trouble backing the change out.
> 
> Revision 378759 has these additions and changes:
> 
>   Added:
>       db/derby/docs/trunk/src/tuning/ctundepthoptover.dita
>       db/derby/docs/trunk/src/tuning/ctunoptimzoverride.dita
>   Modified:
>       db/derby/docs/trunk/src/tuning/tuningderby.ditamap
> 
> I get an error when I try to restore the previous version of
> tuningderby.ditamap:
> 
>   [jta@gertie3 trunk]$ svn merge -r 378759:378758
> https://svn.apache.org/repos/asf/db/derby/docs/trunk/src/tuning/tuningderby.ditamap
> svn: REPORT request failed on '/repos/asf/!svn/vcc/default'
> svn:
> Cannot replace a directory from within
> 
> 
> does anyone spot what I'm doing wrong?

I see my error. Here's the correct way:

[jta@gertie3 trunk]$ svn merge -r 378759:378758
https://svn.apache.org/repos/asf/db/derby/docs/trunk/
D  src/tuning/ctunoptimzoverride.dita
D  src/tuning/ctundepthoptover.dita
U  src/tuning/tuningderby.ditamap

sorry for the noise,

 -jean




Mime
View raw message