[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: bin/56496: etcupdate(8) merge formatting issue
The following reply was made to PR bin/56496; it has been noted by GNATS.
From: Valery Ushakov <uwe%stderr.spb.ru@localhost>
Subject: Re: bin/56496: etcupdate(8) merge formatting issue
Date: Mon, 15 Nov 2021 02:16:33 +0300
On Sat, Nov 13, 2021 at 13:35:00 +0000, Hauke Fath wrote:
> The -current etcupdate(8) file merge has a formatting issue:
> In a merge session, the right hand column expands whitespace
> (tabs, presumably) incorrectly such that even on a 160 col
> xterm most of the lines wrap around.
etcupdate just calls sdiff(1) to do the merge. And i"m pretty sure we
haven't updated diffutils in quite a while...
You can easily try to reproduce it with something like:
sdiff -w $(stty size | cut -d' ' -f 2) -s -a -o merged old new
Are you sure you have correct cols value in stty? (I see that you use
amd64, my first hunch was arm with the "unified" display/serial
console, doing the merge on a serial in a smaller term - you'd get
cols from the wide(r) display there).
Main Index |
Thread Index |