On 6/30/06, Dennis Tomas <firstname.lastname@example.org> wrote:
Lucas Hazel wrote:
> On 6/30/06, *Dennis Tomas* <email@example.com
> Lucas Hazel wrote:
> > On 6/29/06, *Dennis Tomas* <
> > <mailto:
> <mailto:firstname.lastname@example.org>>> 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
> > 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
> 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:
mv rox rox.old
cp /path/to/lock_icons.patch .
patch -p1 -i ../lock_icons.patch
and it worked.
> 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!
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.