Tagged Questions
3
votes
6answers
181 views
how to use patch and diff to merge two files
I have read about diff and patch but I can't figure out how to apply what I need.
I guess its pretty simple, so to show my problem take these two files:
a.xml
<resources>
<color ...
6
votes
6answers
264 views
Review changes in .tex files
I have two files paper.tex and paper_suggested_changes.tex the latter is a modified version of the former with corrections.
I need to go through the two files and choose which changes to accept or ...
4
votes
3answers
110 views
Smart way to perform a similar replacement (not simple enough for diff) in multiple files?
I have a bunch of files (45, so too many to edit them manually without going crazy) which all require the same changes (as seen in the three diffs at the end of this question).
Most tools used for ...
3
votes
3answers
180 views
How to make and apply (patch) one side diff?
I want to make a shell script that updates a config file.
The file present on the server has information, like various IP addresses.
The new file has more code, from new configs added to the system, ...
1
vote
1answer
235 views
Reading two files into an IFS while loop — Is there a way to get a zero diff result in this case?
I have a text file full of several hundred lines of sequences like this:
b 29.
b 52.
c 84.
c 83.
c 94.
c 93.
c 61.
b 38.
c 81.
c 92.
c 28.
c 37.
...
2
votes
2answers
204 views
Comparing files and their properties
I get information of a certain set of files in my mail every day, which looks like this:
58623208 Sep 14 20:08 blbn_blfbe_drv
57904920 Sep 14 19:54 blbn_cycmn
55814208 Sep 14 06:02 clsa_Upd
38912000 ...
5
votes
4answers
465 views
Compare an old file and new file, but ignore lines which only exist in new file?
I have two files:
oldlist - This contains a list of files and a md5 hash for each file. This was generated one year ago.
newlist - This also contains a list of files and a md5 hash for each file. ...
4
votes
1answer
210 views
merge that works at word granularity instead of line
The old diff, patch, and merge programs, and their modern descendents in the form of version control systems work great for managing source code that can be edited concurrently by multiple people.
...
