On 31 March 2012 14:56, Darrell Anderson <humanreadable@...> wrote:
>> Like I said, I've been working on
>> some patches quietly. Here is one.
>>
>> This fixes bug 908, by implementing an option to enable
>> cycling through desktops with the mouse wheel.
>>
>> Please test this out.
>>
>> http://bugs.trinitydesktop.org/show_bug.cgi?id=908
>
> Calvin,
>
> I never can merge your patches regardless of the -p level I use. I always have to manually edit the patches with path names to find the files.
>
> How do I merge your patches? I run this in my build scripts:
>
> cat $CWD/pagerpatch.patch | patch -p1 --verbose --no-backup-if-mismatch || exit 1
>
> How do you create your patches to get that "Index:" thingie at the top?
>
> Darrell
>

I almost exclusively use the control system's diff command, be it GIT or SVN.

I am running on 3.5.13 sources so  I make all my patches under the
3.5.13 code. ( I make sure not to add any conflicts with the current
GIT head), I just use svn diff and pipe the output into a file.

Calvin