On Tue, Nov 16, 2021 at 01:36:53AM +0100, Dominik Vogt wrote:
> This is the full set of patches for splitting the man page, to be
> applied to master.
> 1, 2 and 4 are unrelated cleanups.
> 3 and 5 implement the split.
> 4 conflicts with both, 3 and 5, so it can't be pulled out of the
> sequence.

I'm not able to apply these patches cleanly.  Patch 5 is failing to apply:

        [~/p/f/fvwm3]{2972}[ta/manpage-sections][10bd094] % git am -3 /tmp/d/* 
        Applying: Correct a sentence in the man page.
        Applying: Rephrase Title style documentation.
        Applying: Split main man page.
        Applying: Cleanup man page.
        Applying: fvwm3styles man page.
        Using index info to reconstruct a base tree...
        .git/rebase-apply/patch:6588: space before tab in indent.
                          StaysOnTop, WindowListSkip
        .git/rebase-apply/patch:6591: space before tab in indent.
        error: patch failed: doc/fvwm3_manpage_source.adoc:5186
        error: doc/fvwm3_manpage_source.adoc: patch does not apply
        error: Did you hand edit your patch?
        It does not apply to blobs recorded in its index.
        Patch failed at 0005 fvwm3styles man page.
        hint: Use 'git am --show-current-patch=diff' to see the failed patch
        When you have resolved this problem, run "git am --continue".
        If you prefer to skip this patch, run "git am --skip" instead.
        To restore the original branch and stop patching, run "git am --abort".

Patches 1 - 4 before it apply just fine.

Any thoughts?


Reply via email to