Re: [PATCH] (5) Man page changes
On Wed, Nov 17, 2021 at 05:59:49AM +, Thomas Adam wrote: > 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: > > .git/rebase-apply/patch:6588: space before tab in indent. > StaysOnTop, WindowListSkip > .git/rebase-apply/patch:6591: space before tab in indent. > WindowListSkip > error: patch failed: doc/fvwm3_manpage_source.adoc:5186 Please apply them now while I see what can be done to fix #5. Can you give me the hook scripts that do these checks so that I catch these things locally before sending patches? > Any thoughts? Some of the examples are indented with tabs; something like this: --snip-- Examples: ``` foo bar baz ``` --snip-- I moved around a big chunk of text because there was some problem with nested ifdefs. If this can be solved it's not necessary to shuffle text blocks. Let me take a look. Ciao Dominik ^_^ ^_^ -- Dominik Vogt
Re: [PATCH] (5) Man page changes
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.
WindowListSkip
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?
Thomas
