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 ...
2
votes
2answers
40 views
Keep patch in sync with changing source
Is there any standard option to create 'patch' P that works on file F in such way that it will keep working correctly when file F changes into F'.
So I will either have some mechanism that will ...
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, ...
2
votes
2answers
181 views
how to include a new file into a patch
I try to make a patch as introduced here.
Say I have two directories pp1(modified version) and pp0(clean version), I make a patch file pp0.patch with the diff command:
diff -crB pp0 pp1 > ...
2
votes
1answer
669 views
Patching a file (in this case dwm) and failed hunks
I'm trying to add the transparency patch to dwm. I downloaded the .diff file and in my dwm directory ran this:
max@linux-vwzy:~/misc/dwm/dwm-5.9> patch < dwm-transparency.diff
patching 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.
...
1
vote
1answer
227 views
RPMs and patching
I have 3 files (from here)that I have been given to install in an attempt to upgrade the compiler:
binutils-2.13.2.1-1.mipsel.rpm
binutils-2.13.2.1-1.src.rpm
binutils-2.13.2.1-r5900-7.diff.gz
...
1
vote
1answer
344 views
Pipe diff file into patch?
Is there a way to pipe the diff output into patch? The -i parameter is for specifying a diff file, but I just want to do it more dynamically, since I will be updating regularly against a directory ...
