From: Dan Harkless <cygwin-list21@harkless.org>
To: Bernhard Voelker <mail@bernhard-voelker.de>,
bug-findutils@gnu.org, cygwin@cygwin.com
Subject: Re: Patches to findutils 4.9.0-1's updatedb to do locking, allow filenames with spaces & progress monitoring, exclude /dev on Cygwin, etc.
Date: Sun, 27 Feb 2022 04:06:32 -0800 [thread overview]
Message-ID: <4ce6d539-09c4-da8d-9e17-80df3667d8aa@harkless.org> (raw)
In-Reply-To: <f5455ae6-a91c-b948-1c21-133cec1816f8@bernhard-voelker.de>
On 2/27/2022 3:54 AM, Bernhard Voelker wrote:
> On 2/24/22 17:32, Dan Harkless wrote:
>> I'm finally getting around to sending in a patch (to bug-findutils and
>> the Cygwin list, to which I'm currently subscribed) to address these
>> issues, along with some others, a few of which represent small changes
>> in behavior:
> Thanks for the patch ... but:
Thanks for taking a look at it.
> a) The patch does not cleanly apply:
>
> ~/findutils/locate> patch -t < /tmp/updatedb.patch
> patching file updatedb
> Reversed (or previously applied) patch detected! Assuming -R.
> Hunk #2 succeeded at 47 with fuzz 2.
> Hunk #7 FAILED at 167.
> Hunk #8 FAILED at 202.
> Hunk #9 succeeded at 217 (offset -2 lines).
> Hunk #10 succeeded at 276 (offset -2 lines).
> 2 out of 10 hunks FAILED -- saving rejects to file updatedb.rej
Ah. As I mentioned, my patch was against Cygwin's findutils 4.9.0-1,
and since my Linux systems use a different version of locate, I hadn't
tested there (nor did I have time to look at the original 4.9.0
source). I'd been hoping any Cygwin patches wouldn't invalidate it; pity.
> b) The patch changes the file 'updatedb' which is created at build time
> instead of the file 'updatedb.sh' which is under version control.
Gotcha.
> c) The description says that there are 10 more or less non-trivial
> changes in it. A squashed diff of 500 lines on a file with 342 lines
> makes reviewing and discussing of each topic impossible.
Impossible? Since the bulk of the changes are spacing changes to
standardize code indentation across the file, I was hoping the separate
'diff -uw' listing would be sufficient to enable easy review and discussion.
> Would you mind re-sending as separate Git patches?
It'll be awhile before I'll have time to get set up to do that, but will do.
> Have a nice day,
> Berny
Thanks again,
Dan Harkless
http://harkless.org/dan/
prev parent reply other threads:[~2022-02-27 12:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <986736274.144968.1630167325057.ref@mail.yahoo.com>
2021-08-28 16:15 ` updatedb broken as of findutils 4.8.0-1 due to bigram.exe no longer being provided Dan Harkless
2021-08-28 16:23 ` Dan Harkless
2021-08-29 11:02 ` Hans-Bernhard Bröker
2021-08-29 12:06 ` Dan Harkless
2021-08-30 0:06 ` Brian Inglis
2022-02-24 16:32 ` Patches to findutils 4.9.0-1's updatedb to do locking, allow filenames with spaces & progress monitoring, exclude /dev on Cygwin, etc Dan Harkless
2022-02-27 11:54 ` Bernhard Voelker
2022-02-27 12:06 ` Dan Harkless [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ce6d539-09c4-da8d-9e17-80df3667d8aa@harkless.org \
--to=cygwin-list21@harkless.org \
--cc=bug-findutils@gnu.org \
--cc=cygwin@cygwin.com \
--cc=mail@bernhard-voelker.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).