Re: Patch for a new feature : sozi

[Hans Breuer <hans breuer org>]

Hi Paul,
sorry for the delay, I wanted to doublecheck the result of applying your 
patch on Linux and than forgot about it.

At 14.09.2011 00:04, Paul Chavent wrote:
[...]
> Hello mailing list.
>
> I give you a new version of the sozi patch.
>
> I fixed the long lines issue.
> I replaced gsnprintf by gstrdup and g_ascii_formatd().
This looks good and I would have commited your patch to git, but it does 
not apply for me consistently on Windows and Linux:

"""
git apply --whitespace=fix 0002-Add-sozi-front-end.patch
0002-Add-sozi-front-end.patch:28: trailing whitespace.
                        tree.c \
0002-Add-sozi-front-end.patch:29: trailing whitespace.
                        sozi-frame.c
0002-Add-sozi-front-end.patch:38: trailing whitespace.
        pixmaps/tree.xpm \
0002-Add-sozi-front-end.patch:39: trailing whitespace.
        pixmaps/sozi-frame.xpm
0002-Add-sozi-front-end.patch:51: trailing whitespace.
extern DiaObjectType sozi_frame_type;
fatal: git apply: bad git-diff - expected /dev/null on line 66
"""

The error message from git isn't particular useful, because it has exactly 
that on line 66. Switching to "git am" does not work either:

"""
git am  0002-Add-sozi-front-end.patch
Patch format detection failed.
"""

So I'm out of ideas (except for manually merging it) ...

> I hope new feedbacks.

-------- Hans "at" Breuer "dot" Org -----------
Tell me what you need, and I'll tell you how to
get along without it.                -- Dilbert