On Tue, Nov 3, 2020 at 10:16 AM Scott Kostyshak <skost...@lyx.org> wrote:
> On Tue, Nov 03, 2020 at 07:14:48AM -0700, Joel Kulesza wrote: > > On Mon, Nov 2, 2020 at 11:06 PM Stephan Witt <st.w...@gmx.net> wrote: > > > > > Am 02.11.2020 um 19:10 schrieb Joel Kulesza <jkule...@gmail.com>: > > > > > > > > On Sun, Nov 1, 2020 at 4:19 PM Richard Kimberly Heck < > rikih...@lyx.org> > > > wrote: > > > > On 11/1/20 4:54 PM, Richard Kimberly Heck wrote: > > > > > > > > Attached is the patch. > > > > > > > > Riki > > > > > > > > I seem to never be able to successfully apply patches. This is no > > > exception (I'm on master at e8a28c33c), so I cannot test it (complaints > > > follow my signature for those interested). Regardless, after reading > > > through the changes, they all seem reasonable. Thank you, Riki, for > taking > > > this upon yourself! I hope that we can move forward from here. > Please let > > > me know what I can do to help. > > > > > > > > Thank you again, > > > > Joel > > > > > > Perhaps it is a difference in CR/LF of patch and work area? > > > > > > The patch has Unix line endings. > > > > > > Stephan > > > > > > See here: > > > > https://stackoverflow.com/questions/6308625/how-to-avoid-git-apply-changing-line-endings > > > > > > That doesn't seem to be it (note: I'm on macOS, so I expect Unix line > > endings to be OK). > > > > I've tried `unix2dos`, `dos2unix`, and --whitespace=fix on the git apply, > > and they all fail. > > Have you tried with "git am"? > I have—that was the first approach I tried based on an email suggestion from some time ago. Thanks, Joel
-- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
