[Solved] Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-09 Thread Susmita/Rajib
As mentioned in the following email: To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: "Susmita/Rajib" Date: Sat, 8 Apr 2023 23:12:57 +0530 Message-id: <[🔎] CAEG4cZWR7j

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-09 Thread Greg Wooledge
On Sun, Apr 09, 2023 at 03:13:22PM +0530, Susmita/Rajib wrote: > I apologise I didn't get you. Do you not want me to quote the following > portion? Perhaps you don't understand what your own messages look like. Therefore, the best advice I can give you is to look at them through an external le

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-09 Thread Brad Rogers
On Sun, 9 Apr 2023 15:13:22 +0530 "Susmita/Rajib" wrote: Hello Susmita/Rajib, >Sometimes I have difficulties understanding some emails. That's understandable if, as I'm assuming, English is not your first language. >Could you please elaborate a little further please? Use a quote style like ev

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-09 Thread davidson
On Sun, 9 Apr 2023 Susmita/Rajib wrote: [trim] I just received an email from Mr. Sascha Steinbiss, the maintainer for icdiff, and tried implementing his advice on columns. I have received messages from Mr. Jeff Kaufman, the original creator. Copies of my emails have been sent you too. My system'

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-09 Thread Susmita/Rajib
To: Debian Users ML Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: Brad Rogers Date: Sun, 9 Apr 2023 08:46:18 +0100 Message-id: <[🔎] 20230409084618.1807a...@earth.stargate.org.uk> Mr. Brad Rogers said: [ ... ] Please

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-09 Thread Brad Rogers
Please be are that people here are volunteering their time, and time is a precious commodity. Would you therefore, make life easy for them by using a convention quoting style in your messages to the list. Persist with the style you currently employ and you will find that people's desire to help w

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-08 Thread Susmita/Rajib
In further response to two emails received from Mr. Davidson. To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: davidson Date: Sat, 8 Apr 2023 13:27:54 + (UTC) Message-id

Re: paragraph conversion (was Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?)

2023-04-08 Thread Susmita/Rajib
Dear Mr. Davidson, I just received an email from and tried implementing his advice on columns. I have received messages from Mr. Sascha Steinbiss, the maintainer for icdiff, and Mr. Jeff Kaufman, the original creator. Copies of my emails have been sent you too. My system's screen accommodated u

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-08 Thread Andrew M.A. Cater
king to compare documents. When you deal with a (human) editor who doesn't use LibreOffice, export it as a basic Word document and reimport. If that doesn't work then exchange basic text and use TeX to format the output appropriately. Messing around with complex word-processing documents a

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-08 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: davidson Date: Sat, 8 Apr 2023 13:27:54 + (UTC) Message-id: <[🔎] alpine.deb.2.21.2304081043580.22...@azone.org> In

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-08 Thread davidson
On Sat, 8 Apr 2023 davidson wrote: On Fri, 7 Apr 2023 Susmita/Rajib wrote: Hanging Style___ Also called the Epstein style, this one is probably not the one you are using in your document. At least, not unless you are writing a glossary, or some kind of dictionary.

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-08 Thread davidson
file is used as the Editor to write the article. You compose your original document in Libre Office. Understood. It was used to convert the main file in plain text file for the purpose of diff. You then export it to plain text file format before processing it with tools designed for plain tex

Re: paragraph conversion (was Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?)

2023-04-08 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: paragraph conversion (was Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?) From: davidson Date: Sat, 8 Apr 2023 05:47:45 + (UTC) Message-id: <[🔎] alpine.deb.2.21.2304080512420

paragraph conversion (was Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?)

2023-04-07 Thread davidson
On Wed, 5 Apr 2023 davidson wrote: On Wed, 5 Apr 2023 Susmita/Rajib wrote: On 04/04/2023, davidson wrote: [trim] Attached (unless the listserv software has nuked it) is a sed script "flow" (with verbose comments) which might serve your needs. (Since you have not exhibited here any of the tex

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-06 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: davidson Date: Thu, 6 Apr 2023 18:21:29 + (UTC) Message-id: <[🔎] alpine.deb.2.21.2304061821250.7...@azone.org> In

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-06 Thread davidson
On Thu, 6 Apr 2023 davidson wrote: What indicates a "paragraph break" in a given style depends on the form, not the content, of the material to be processed. Replace "...in a given style" with "...in a given document" -- Sometimes it pays to have squirrels in your head running around mak

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-06 Thread davidson
On Thu, 6 Apr 2023 Susmita/Rajib wrote: [trimmed: email headers included in message body] [ ... ] Dear Mr. Davidson, I think that we better drop this thread for the time being. We are each of us the masters of our respective time and attention, and thank ${DEITY[@]} for that. I look forwar

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-05 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: davidson Date: Wed, 5 Apr 2023 16:25:06 + (UTC) Message-id: <[🔎] alpine.deb.2.21.2304051620250.20...@azone.org> In

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-05 Thread davidson
On Wed, 5 Apr 2023 davidson wrote: Attached (unless the listserv software has nuked it) is a sed script "flow" (with verbose comments) which might serve your needs. (Since you have not exhibited here any of the text you are working with, I can only play the role of speculative optimist.) For tri

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-05 Thread davidson
On Wed, 5 Apr 2023 davidson wrote: Attached (unless the listserv software has nuked it) is a sed script "flow" (with verbose comments) which might serve your needs. (Since you have not exhibited here any of the text you are working with, I can only play the role of speculative optimist.) Tested

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-05 Thread davidson
T. Thank you indeed. It looks to me like icdiff tries to remain faithful to the source comparands, to the files you request it to compare. By "faithful", I mean two things: 1. icdiff will *wrap* lines so that all characters (relevant to the diff context) make it onto the screen

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-05 Thread Susmita/Rajib
On 04/04/2023, davidson wrote: To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: davidson Date: Tue, 4 Apr 2023 11:06:47 + (UTC) Message-id: <[🔎] alpine.

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-04 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: david...@freevolt.org Date: Tue, 4 Apr 2023 11:39:59 + (UTC) Message-id: <[🔎] alpine.deb.2.21.2304041139540.12...@azone.

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-04 Thread davidson
Traceback (most recent call last): File "/usr/bin/icdiff", line 11, in load_entry_point('icdiff==1.9.5', 'console_scripts', 'icdiff')() File "/usr/lib/python3/dist-packages/icdiff.py", line 598, in start diff(options, *args) File &quo

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-04 Thread davidson
On Tue, 4 Apr 2023 davidson wrote: [trim] icdiff will not do that. icdiff is faithful to its sources. I have determined this by trying it out a little myself, and by examining the command line options documented in its manual page ("man icdiff"). You could give it different sources: $ icdiff <(

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-04 Thread davidson
On Mon, 3 Apr 2023 Susmita/Rajib wrote: [trimmed headers] [ ... ] You have reported that redirecting icdiff output to a file, in your words, "drops all colors". And so I have three questions: [trimmed davidson's questions] $ icdiff file1 file2 > pretty_diff $ less -R pretty_diff [ ...

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-03 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: davidson Date: Mon, 3 Apr 2023 01:27:46 + (UTC) Message-id: <[🔎] alpine.deb.2.21.2304030127380.28...@azone.org> In

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-02 Thread davidson
On Sun, 2 Apr 2023 Susmita/Rajib wrote: [trimmed: email headers] On Sat, 1 Apr 2023 Susmita/Rajib wrote: [ ... ] You do not tell us what application you are using to view the file contents. If it is not a terminal application, it might well fail to independently implement for your delightful

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-02 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: rhkra...@gmail.com Date: Sat, 1 Apr 2023 09:07:47 -0400 Message-id: <[🔎] 202304010907.47888.rhkra...@gmail.com> In-re

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-02 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: davidson Date: Sat, 1 Apr 2023 10:54:06 + (UTC) Message-id: <[🔎] alpine.deb.2.21.2304011044320.15...@azone.org> In

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread rhkramer
On Saturday, April 01, 2023 10:22:24 AM debian-u...@howorth.org.uk wrote: > rhkra...@gmail.com wrote: > > I don't remember the name of the utility that I used to use in the > > Microsoft world, but it was very nice in showing changes within lines > > or paragraphs, using underline and crossout (wro

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread debian-user
gt; > > When I receive the editor's correction, I don't accept them > > straightaway, but based on his suggestions I change my book1 and > > edit and alter it further. Diff helps in comparing the two draft > > editions. > > > > This one cycle could again

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread rhkramer
On Saturday, April 01, 2023 09:07:47 AM rhkra...@gmail.com wrote: > On Friday, March 31, 2023 11:37:30 PM Susmita/Rajib wrote: > I don't remember the name of the utility that I used to use in the > Microsoft world, but it was very nice in showing changes within lines or > paragraphs, using underlin

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread rhkramer
tion, I don't accept them > straightaway, but based on his suggestions I change my book1 and edit > and alter it further. Diff helps in comparing the two draft editions. > > This one cycle could again be repeated. > I checked wdiff and also dwdiff. But they are very bland > an

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread Nate Bargmann
I prefer vimdiff. - Nate -- "The optimist proclaims that we live in the best of all possible worlds. The pessimist fears this is true." Web: https://www.n0nb.us Projects: https://github.com/N0NB GPG fingerprint: 82D6 4F6B 0E67 CD41 F689 BBA6 FB2C 5130 D55A 8819 signature.asc Description: PGP

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread Max Nikulin
On 01/04/2023 14:59, DdB wrote: In fact, unfortunately, i did not understand the necessity to wrap the output, as i am happily using the synchronised scrollbar (inside meld) in such cases, but ofc, that may not fit your use case. If it is prose text formatted as a line per paragraph then wrappe

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread davidson
On Sat, 1 Apr 2023 davidson wrote: The "colors" are control sequences, instructions for terminal emulators conforming to a standard. Terminals understand them to mean "now paint glyphs red" or "now make them bold" or "now stop doing all that fancy stuff" etc. Erm, what I meant to say is that th

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread davidson
On Sat, 1 Apr 2023 Susmita/Rajib wrote: [ ... ] Try icdiff file1 file2 | less -R and report back. [ ... ] Yes, it worked. Worked better than the code-line with " | more". Mouse-scrolling working both ways. So really thank you. My need should have been fulfilled so far as the purpose o

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: Date: Sat, 1 Apr 2023 10:14:44 +0200 Message-id: In-reply-to: <[🔎] CAEG4cZUXaUAxG=0zlwpxuy44x9rtf7tnewvgfuddmzq7

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: davidson Date: Sat, 1 Apr 2023 07:34:39 + (UTC) Message-id: <[🔎] alpine.deb.2.21.2304010734350.15...@azone.org> In

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread tomas
On Sat, Apr 01, 2023 at 12:10:27PM +0530, Susmita/Rajib wrote: > To: debian-user@lists.debian.org > Subject: Re: Which Diff tool could I use for visually comparing > two text files where Word Wrap is possible? > From: > Date: Sat, 1 Apr 2023 07:56:24 +0200 >

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread DdB
Am 01.04.2023 um 05:37 schrieb Susmita/Rajib: > Dear Mr. DdB: > I fondly remember my interaction with you some time during May 2022. > Perhaps you have overlooked that I needed text wrapping for diff. I > have checked the synaptic screenshot for meld, have installed and > tried

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread davidson
On Sat, 1 Apr 2023 Susmita/Rajib wrote: My illustrious team leaders and senior debian-user list-members, [trimmed: admirably comprehensive description of OPs use-case] Diff helps in comparing the two draft editions. It does indeed do what it was designed to do. Dear Mr. l0f4r0: that

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-04-01 Thread David
On Sat, 2023-04-01 at 12:10 +0530, Susmita/Rajib wrote: >     To: debian-user@lists.debian.org >     Subject: Re: Which Diff tool could I use for visually comparing > two text files where Word Wrap is possible? >     From: >     Date: Sat, 1 Apr 2023 07:56:24 +0200 >   

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread Susmita/Rajib
To: debian-user@lists.debian.org Subject: Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible? From: Date: Sat, 1 Apr 2023 07:56:24 +0200 Message-id: <[🔎] zcfhibipctx8o...@tuxteam.de> In-reply-to

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread tomas
On Sat, Apr 01, 2023 at 09:07:30AM +0530, Susmita/Rajib wrote: [...] > The above limitations directs me to suggest to Debian Teams across all > Mailing Lists and the Board to have GPT4 added to extend > functionalities of GNU-Linux systems [...] GPT is not free software, so it can't be included

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread Susmita/Rajib
: caeg4czus4dyt02pvm5byvrpxtxvdeybthfgwhrhi80upoy9...@mail.gmail.com makes my need clear, I would like to avoid diff. My reason has been posted in that earlier 2nd post. Dear Mr. Stefan Monnier and Mr. Van Snyder: Unfortunately, I once tried to learn emacs but it is complex. So it is difficult for me to use diff from within

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread Susmita/Rajib
lter it further. Diff helps in comparing the two draft editions. This one cycle could again be repeated. Dear Mr. l0f4r0: that pointer, https://unix.stackexchange.com/questions/537418/how-to-make-text-wrap-with-diff-y; indeed helped and led me to icdiff which is wonderful. Unfortunately, for two

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread Greg Wooledge
On Sat, Apr 01, 2023 at 01:41:22AM +, davidson wrote: > On Sat, 1 Apr 2023 davidson wrote: > > Start here instead: > > > > $ diff file1 file2 > > > > It displays the differences, and your terminal will wrap lines (and > > break words) to fit the windo

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread davidson
On Sat, 1 Apr 2023 davidson wrote: Start here instead: $ diff file1 file2 It displays the differences, and your terminal will wrap lines (and break words) to fit the window for you. Does it do what you want? A concise explanation of diff's default output format (which is a little cr

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread davidson
ile windows. I see (from its package description above) that diffuse can display files' content side-by-side. Is this a requirement of yours? Because if it is not, you can double your effective screen width by simply discarding the side-by-side feature. $ diff <(fmt file1) <(fmt file2)

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread davidson
e the differences between two files within the program window without venturing out to the right within the two file windows. $ diff <(fmt file1) <(fmt file2) fmt has a -w option to adjust the max line width. The default is 75. Is there a way to Word Wrap? Am I making a mistake here? Wh

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread Van Snyder
text > > files? > > Try Kompare. I tried several diff tools but I liked Kompare the most: > clean, intuitive interface, easy to use, lots of features. emacs includes a nice side-by-side compare and merge feature. > Regards,

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread local10
he program window without venturing out to > the right within the two file windows. > > Is there a way to Word Wrap? Am I making a mistake here? Which program > would be the best suited for my work for comparing text files? > Try Kompare. I tried several diff tools but I liked Kom

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread DdB
shes, > Rajib B > Etc. > > I may be misunderstanding your needs: In many cases, i replace diff with meld, an interactive diff UI

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread rhkramer
en quite a while since I actually used diff, but I always preferred a word diff (to a line based diff). Two options are wdiff and wdiff2 (aka mdiff -w) -- rhk (sig revised 20230312 -- modified first paragraph, some other irrelevant wordsmithing) | No entity has permission to us

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread Stefan Monnier
>> Is there a way to Word Wrap? Am I making a mistake here? >> Which program would be the best suited for my work for comparing >> text files? I'd expect most text editors to do that for you. E.g. when I ask Emacs to give me a diff for "files with long lines", t

Re: Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread l0f4r0
wrap-with-diff-y l0f4r0

Which Diff tool could I use for visually comparing two text files where Word Wrap is possible?

2023-03-31 Thread Susmita/Rajib
My dear illustrious leaders and senior debian-user list-members, I tried diffuse, but it appears to me that it suffers from a limitation so far as my need is concerned. It compares files by lines and line numbers, so I can't use word-wrap to have the differences between two files within the progra

Re: How do I contribute patches to packages (GitLab merge requests or diff -u + bug report)?

2020-11-28 Thread Dan Ritter
Vishal Subramanyam wrote: > I wish to contribute patches to Debian packages, but I am confused > about how I should go about doing so. The Debian Handbook says that > using GitLab might make it easier for maintainers to merge changes, but > somebody on an IRC channel told me that the old email-bas

How do I contribute patches to packages (GitLab merge requests or diff -u + bug report)?

2020-11-28 Thread Vishal Subramanyam
Hey, I wish to contribute patches to Debian packages, but I am confused about how I should go about doing so. The Debian Handbook says that using GitLab might make it easier for maintainers to merge changes, but somebody on an IRC channel told me that the old email-based workflow is still the domin

diff ignore list

2013-09-12 Thread Ash Narayanan
Doing: diff -r -X .ignore-list doesn't seem to work if .ignore-list contains entries of the form / Entries of the form do however work. This is a problem since I might have multiple files named in different sub-directories, some of which I don't want ignored. There doesn't

Re: comment diff files

2011-11-25 Thread Ralf Mardorf
On Fri, 2011-11-25 at 22:17 +0100, Ralf Mardorf wrote: > On Fri, 2011-11-25 at 18:14 +, Clive Standbridge wrote: > > Jerome BENOIT wrote: > > > Hello List: > > > > > > Is there any way to comment a diff file ? > > > > Interesting question. &g

Re: comment diff files

2011-11-25 Thread Ralf Mardorf
On Fri, 2011-11-25 at 18:14 +, Clive Standbridge wrote: > Jerome BENOIT wrote: > > Hello List: > > > > Is there any way to comment a diff file ? > > Interesting question. ;D Until now I'm only using, not writing patches. What happens if we would write some

Re: comment diff files

2011-11-25 Thread Jerome BENOIT
Thanks ! On 25/11/11 19:14, Clive Standbridge wrote: Jerome BENOIT wrote: Hello List: Is there any way to comment a diff file ? Interesting question. I don't know, but perhaps this paragraph from the patch(1) may help: patch tries to skip any leading garbage, apply the diff, and then

Re: comment diff files

2011-11-25 Thread Clive Standbridge
Jerome BENOIT wrote: > Hello List: > > Is there any way to comment a diff file ? Interesting question. I don't know, but perhaps this paragraph from the patch(1) may help: patch tries to skip any leading garbage, apply the diff, and then skip any trailing garbage. Thus you

Re: comment diff files

2011-11-25 Thread Lou
From: Jerome BENOIT rezozer.net> Is there any way to comment a diff file ? I don't think so - you apply the diff using patch, then you put comments into the modified file, then you run a diff against the original version to get the difference with comments included. -- To UNS

comment diff files

2011-11-25 Thread Jerome BENOIT
Hello List: Is there any way to comment a diff file ? Thanks in advance, Jerome -- To UNSUBSCRIBE, email to debian-user-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4ecfd177.3000...@rezozer.net

Re: Will diff --show-c-function behaves resonably for non C files?

2011-08-15 Thread Darac Marjal
On Sat, Aug 13, 2011 at 03:51:33PM -0700, Regid Ichira wrote: > $ diff --help | grep -e --show-c-function > -p --show-c-function Show which C function each change is in. > > Will diff -p behaves reasonably when applied to non C files? > I want to use the -p option in a s

Will diff --show-c-function behaves resonably for non C files?

2011-08-13 Thread Regid Ichira
$ diff --help | grep -e --show-c-function -p --show-c-function Show which C function each change is in. Will diff -p behaves reasonably when applied to non C files? I want to use the -p option in a script that does not necessarily act on C files? -- To UNSUBSCRIBE, email to debian

Re: diff original .conf files in packages with the ones installed

2011-07-02 Thread Sven Joachim
On 2011-07-02 19:38 +0200, Hendrik Boom wrote: > What I would love is to have all the true configuration files checked > into a revision management system (such as monotone). There would be a > vendor branch, various changes performed during installation, and finally > any changes made by the s

Re: diff original .conf files in packages with the ones installed

2011-07-02 Thread Hendrik Boom
ons, > debootstrap, chroot and install the selection and then make the diff. > > although it looks like overkill when you just want to check out a few > files > > maybe just find out where the file came from with apt-file, download the > package, extract the file and do

Re: diff original .conf files in packages with the ones installed

2011-07-02 Thread William Hopkins
> > be paying attention during the upgrade process. > > > > dpkg will already prompt you to view a diff of a config file that is to be > > changed if you have a modified version installed. > > > > If you need anything more granular than this, perhaps install tr

Re: diff original .conf files in packages with the ones installed

2011-07-01 Thread alberto fuentes
this? > > comparing dpkg --get-selections before and after is an easy way to see what > new > packages have been installed, which have been upgraded, etc. But you > *should* > be paying attention during the upgrade process. > > dpkg will already prompt you to view a diff

Re: diff original .conf files in packages with the ones installed

2011-07-01 Thread alberto fuentes
On Fri, Jul 1, 2011 at 3:04 PM, Peter Wiersig < fri...@london087.server4you.de> wrote: > On Fri, 1 Jul 2011 09:44:41 +0200, alberto fuentes > wrote: > > > > The easier way it comes to mind is to dpkg --get-selections, debootstrap, > > chroot and install the se

Re: diff original .conf files in packages with the ones installed

2011-07-01 Thread William Hopkins
new packages have been installed, which have been upgraded, etc. But you *should* be paying attention during the upgrade process. dpkg will already prompt you to view a diff of a config file that is to be changed if you have a modified version installed. If you need anything more granular than t

Re: diff original .conf files in packages with the ones installed

2011-07-01 Thread Peter Wiersig
On Fri, 1 Jul 2011 09:44:41 +0200, alberto fuentes wrote: > > The easier way it comes to mind is to dpkg --get-selections, debootstrap, > chroot and install the selection and then make the diff. dpkg-repack and the debdiff command from the package devscripts? Perter -- To UNSUBSCRI

diff original .conf files in packages with the ones installed

2011-07-01 Thread alberto fuentes
This would be handy to checkout messed up systems to be able to tell apart easily whats has been touched. Is there already something that makes this? The easier way it comes to mind is to dpkg --get-selections, debootstrap, chroot and install the selection and then make the diff. although it

Re: if the file changes send email about diff

2011-02-09 Thread owen
I have 2 script. Script "A", Script "B". ... If the goal is to see if a lease is either released by the client or times out on the server, then why not just set up an action in dhcpd.conf to email when either of these events take place? If you're not using DDNS, then this should be fairly easy

Re: if the file changes send email about diff

2011-02-07 Thread Mark Neidorff
On Sunday 06 February 2011 12:25 pm, kellyremo wrote: > The file only contains plain MAC addresses, separated with a new line: > > Like: > FF:FF:FF:FF:FF:F1 > FF:FF:FF:FF:FF:F2 > > Or: > FF:FF:FF:FF:FF:F2 > > On Sun, 06 Feb 2011 06:40:32 -0800 frank thyes > wrote > >

Re: if the file changes send email about diff

2011-02-06 Thread Bob Proulx
kellyremo wrote: > I have 2 script. Script "A", Script "B". > > Script "A" is regulary watching the "dhcpacks" [dhcp release is > configured to 2mins] in the logs, for the past 2 minutes. it writes > the MAC addresses to a file [/dev/shm/dhcpacks-in-last-2min.txt] > every 2 minutes. Ok, this is wo

Re: if the file changes send email about diff

2011-02-06 Thread frank thyes
On Sun, 2011-02-06 at 09:25 -0800, kellyremo wrote: > The file only contains plain MAC addresses, separated with a new line: > > Like: > FF:FF:FF:FF:FF:F1 > FF:FF:FF:FF:FF:F2 > > Or: > FF:FF:FF:FF:FF:F2 Then your script is absolutely useless. Frank -- To UNSUBSCRIBE, email to debian-user-re

Re: if the file changes send email about diff

2011-02-06 Thread kellyremo
The file only contains plain MAC addresses, separated with a new line: Like: FF:FF:FF:FF:FF:F1 FF:FF:FF:FF:FF:F2 Or: FF:FF:FF:FF:FF:F2 On Sun, 06 Feb 2011 06:40:32 -0800 frank thyes wrote On Sun, 2011-02-06 at 05:33 -0800, kellyremo wrote: > /dev/shm/dhcpack

Re: if the file changes send email about diff

2011-02-06 Thread frank thyes
On Sun, 2011-02-06 at 05:33 -0800, kellyremo wrote: > /dev/shm/dhcpacks-in-last-2min.txt Could you pastebin this file too? Frank -- To UNSUBSCRIBE, email to debian-user-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://list

Re: Removing mktmp and diff

2010-12-26 Thread Sven Joachim
On 2010-12-26 22:03 +0100, Slicky Johnson wrote: > Is it safe to remove these from Squeeze? > > $ deborphan > mktemp > diff Yes, those are empty transitional packages in squeeze, so you can safely remove them. > # aptitude purge diff mktemp > The following packages will b

Removing mktmp and diff

2010-12-26 Thread Slicky Johnson
Is it safe to remove these from Squeeze? $ deborphan mktemp diff $ aptitude why diff Unable to find a reason to install diff. aptitude why mktemp Unable to find a reason to install mktemp. # aptitude purge diff mktemp The following packages will be REMOVED: diff{p} mktemp{p} 0 packages

Re: Graphical diff/patch viewer

2010-11-08 Thread Rob Gom
[cut] > > I'd be very interested in seeing a case where kompare displays a valid patch > incorrectly. > -- > Boyd Stephen Smith Jr.                   ,= ,-_-. =. FYI, https://bugs.kde.org/show_bug.cgi?id=256355 Regards, Robert -- To UNSUBSCRIBE, email to debian-user-requ...@lists.debian.org wit

Re: Graphical diff/patch viewer

2010-11-04 Thread Rob Gom
, >> Robert > --Greg > The same story as when looking at patch/diff itself. Sometimes you want to focus on differences, context is given by diff (-u). That's enough for me to review a patch in most cases. Regards, Robert -- To UNSUBSCRIBE, email to debian-user-requ...@lists

Re: Graphical diff/patch viewer

2010-11-04 Thread Gregory Seidman
On Thu, Nov 04, 2010 at 10:30:13AM +0100, Rob Gom wrote: > [cut] > > > > You have to be comfortable in vim, but you can use the following: > > > > gvim "+vert diffpatch " > > > > If you aren't comfortable with vim, you *might* be able to use the > > following, but no guarantees (I don't have a pat

Re: Graphical diff/patch viewer

2010-11-04 Thread Rob Gom
[cut] > > You have to be comfortable in vim, but you can use the following: > > gvim "+vert diffpatch " > > If you aren't comfortable with vim, you *might* be able to use the > following, but no guarantees (I don't have a patch file handy to determine > whether this will work): > > gvim -y "+vert

Re: Graphical diff/patch viewer

2010-11-04 Thread Rob Gom
On Wed, Nov 3, 2010 at 2:00 PM, Jochen Schulz wrote: > Rob Gom: >> >> do you know/is there any graphical patch/diff viewer in Debian (or for >> Linux in general)? Such a tool would produce side by side view of >> changes/deletions/inserts. > > Apart from vimdi

Re: Graphical diff/patch viewer

2010-11-04 Thread Rob Gom
On Wed, Nov 3, 2010 at 7:27 PM, Boyd Stephen Smith Jr. wrote: > In , Rob Gom > wrote: >>There is kompare for KDE, but it is unreliable - produces false >>results for specific patches. > > Odd.  I use it all the time and haven't seen it be inconsistent.  It fails > indicate files have changed when

Re: Graphical diff/patch viewer

2010-11-04 Thread Rob Gom
On Wed, Nov 3, 2010 at 11:00 AM, Javier Barroso wrote: [cut] > Apply the patch in a tmp directory and then use meld, vimdiff, or what you > like > Why should I do such operation? Only to satisfy some tools? I don't need/want to apply huge patches to huge source trees. I want to preview them sepa

Re: Graphical diff/patch viewer

2010-11-03 Thread Boyd Stephen Smith Jr.
In , Rob Gom wrote: >There is kompare for KDE, but it is unreliable - produces false >results for specific patches. Odd. I use it all the time and haven't seen it be inconsistent. It fails indicate files have changed when git uses "Binary files a and b differ." as the patch text, but it shows

Re: Graphical diff/patch viewer

2010-11-03 Thread Jochen Schulz
Rob Gom: > > do you know/is there any graphical patch/diff viewer in Debian (or for > Linux in general)? Such a tool would produce side by side view of > changes/deletions/inserts. Apart from vimdiff: have you tried Kdiff3? J. -- I can tell a Whopper[tm] from a BigMac[tm] and C

Re: Graphical diff/patch viewer

2010-11-03 Thread Gregory Seidman
On Wed, Nov 03, 2010 at 09:08:13AM +0100, Rob Gom wrote: > Hi all, > do you know/is there any graphical patch/diff viewer in Debian (or for > Linux in general)? Such a tool would produce side by side view of > changes/deletions/inserts. > There is kompare for KDE, but it is unreli

Re: Graphical diff/patch viewer

2010-11-03 Thread Javier Barroso
Hi, On Wed, Nov 3, 2010 at 10:00 AM, Rob Gom wrote: > On Wed, Nov 3, 2010 at 9:20 AM, Volkan YAZICI wrote: >> On Wed, 3 Nov 2010, Rob Gom writes: >>> do you know/is there any graphical patch/diff viewer in Debian (or for >>> Linux in general)? Such a tool would p

Re: Graphical diff/patch viewer

2010-11-03 Thread Rob Gom
On Wed, Nov 3, 2010 at 9:20 AM, Volkan YAZICI wrote: > On Wed, 3 Nov 2010, Rob Gom writes: >> do you know/is there any graphical patch/diff viewer in Debian (or for >> Linux in general)? Such a tool would produce side by side view of >> changes/deletions/inserts. >> Th

Re: Graphical diff/patch viewer

2010-11-03 Thread Volkan YAZICI
On Wed, 3 Nov 2010, Rob Gom writes: > do you know/is there any graphical patch/diff viewer in Debian (or for > Linux in general)? Such a tool would produce side by side view of > changes/deletions/inserts. > There is kompare for KDE, but it is unreliable - produces false > resul

Graphical diff/patch viewer

2010-11-03 Thread Rob Gom
Hi all, do you know/is there any graphical patch/diff viewer in Debian (or for Linux in general)? Such a tool would produce side by side view of changes/deletions/inserts. There is kompare for KDE, but it is unreliable - produces false results for specific patches (bug not reported yet, as I have

  1   2   3   4   >