On 6/30/06, Dennis Tomas <2tomas@informatik.uni-hamburg.de> wrote:
Lucas Hazel wrote:
>
>
> On 6/30/06, *Dennis Tomas* <2tomas@informatik.uni-hamburg.de
> <mailto: 2tomas@informatik.uni-hamburg.de>> wrote:
>
>     Lucas Hazel wrote:
>     >
>     >
>     > On 6/29/06, *Dennis Tomas* < 2tomas@informatik.uni-hamburg.de
>     <mailto:2tomas@informatik.uni-hamburg.de>
>     > <mailto: 2tomas@informatik.uni-hamburg.de
>     <mailto:2tomas@informatik.uni-hamburg.de>>> wrote:
>     >
>     >     Lucas Hazel wrote:
>     >     [...]
>     >     >
>     >     >
>     >     > I got patch rejections all over the  place, even with
>     revision 4644
>     >     >
>     >     I generated the patch using svn diff > lock_icons.patch. Is
>     there
>     >     anything wrong with this? (I'm not very experienced with svn)
>     >
>     >
>     > I don't think so, but try using 'diff -urN' see if it make a
>     difference.
>     Not really. I've attached the "new" patch anyway. Are you sure you're
>     using current svn with no other patches applied?
>
>
> Still getting patch rejections, even with current and pristine
> sources. Are you sure your diff is against the same, no local
> modifications, etc?
>
Very sure. I've just done this:

cd ~/Apps
mv rox rox.old
svn co https://svn.sourceforge.net/svnroot/rox/trunk/rox rox
cd rox/ROX-Filer/src
cp /path/to/lock_icons.patch .
patch -p1 -i ../lock_icons.patch

and it worked.


Abrolag wrote:
> In view of your problems, and mine I wonder if Dennis could put the
> whole of his version of ROX filer somewhere with a link to it - It's
> only about 2M after all!
No problem:
ftp://ftp.berlios.de/pub/rox4debian/apps/rox-filer-2.4.1+lock_icons.tgz

I applied the patch by hand, then done a diff of the  2 patches, they only really differed by whitespace. I'd tempted to blame gmail's attachments implementation. I really hate it when email clients embed attachments into the message.