Let's say we have a file. Call it "version 1". Then you copy it to another place, and make some edits. Call this "version 2a". Then copy it to yet another place, and make some different edits. Call this "version 2b".
Now, the simple way to merge changes from 2a to 2b is to find the difference between 1 and 2a, and apply that to 2b.
The patches produced by diff have absolute line numbers etc so you cannot blindly apply them. patch is able to introduce "fuzz" so it can squeeze a patch into place even if some changes have happened in the file.
If there are conflicts, of course, you still need to resolve them.
A version control system probably helps if you need to do this often.
Hi,
I have a file containing a single field on every row. What I need is to append one on to the end of another, e.g.
The input file looks like this:
nnnnn
mmmmmm
nnnnn
mmmmmm
I need it to look like this:
nnnnn mmmmmm
nnnnn mmmmmm
Any ideas would be much appreciated,... (8 Replies)
Is there a way to combine two lines onto a single line...append the following line onto the previous line?
I have the following file that contains some blank lines and some lines I would like to append to the previous line...
current file:
checking dsk c19t2d6
checking dsk c19t2d7
... (2 Replies)
Hi Friends,
I have 2 files A and B . I want to compare the 3rd line of file A and B .
(I dont want to compare the 2 files, using diff or cmp). I just want to know whether 3rd line of A matches the 3 rd line of B. Can anybody share their knowledge on the same?
Thanks ,
Vijaya (12 Replies)
Hello All,
I am writting file comparison Utility and I have encountered such a senario where there are 2 files such as follows-
1#!/usr/local/bin/python
2 import gsd.scripts.admin.control.gsdPageEscalate
3.gsd.scripts.admin.control.gsdPageEscalate.main()
1 #!/usr/local/bin/python... (10 Replies)
Hello all,
I always found help for my problems using the search option, but this time my request is too specific. I have two files that I want to compare. File1 is the index and File2 contains the data:
File1:
chr1 protein_coding exon 500 600 . + . gene_id "20532";... (0 Replies)
Hello,
Please help me with this problem if you have a solution.
I have two files:
<file1> : In each line, first word is an Id and then other words that belong to this Id
piMN-1 abc pqr xyz py12
niLM y12 FY4 pqs
fiRLym F12 kite red
<file2> : same as file1, but can have extra lds... (3 Replies)
Hello I'm having a little difficulty in writing a shell script for a few simple tasks.
First I have two files "file1.txt" and "file2.txt" and I want to read and compare the last line of each file. The files look like this.
File1.txt
File2.txt
After comparing the two lines I would... (2 Replies)
I want to compare 2 files, locus_file.txt is a very large file and attr.txt is a small file. I want to match the first 2 columns of the first file to the second column of attr.txt and print the attributes together.
locus_file.txt:large file
LOC_Os02g47020, LOC_Os03g57840,0.88725114... (3 Replies)
Hello all,
I have a large csv file where there are four types of rows I need to merge into one row per person, where there is a column for each possible code / type of row, even if that code/row isn't there for that person.
In the csv, a person may be listed from one to four times... (9 Replies)
Discussion started by: RalphNY
9 Replies
LEARN ABOUT OSF1
gendiff
GENDIFF(1) General Commands Manual GENDIFF(1)NAME
gendiff - utility to aid in error-free diff file generation
SYNOPSIS
gendiff <directory> <diff-extension>
DESCRIPTION
gendiff is a rather simple script which aids in generating a diff file from a single directory. It takes a directory name and a "diff-
extension" as its only arguments. The diff extension should be a unique sequence of characters added to the end of all original, unmodi-
fied files. The output of the program is a diff file which may be applied with the patch program to recreate the changes.
The usual sequence of events for creating a diff is to create two identical directories, make changes in one directory, and then use the
diff utility to create a list of differences between the two. Using gendiff eliminates the need for the extra, original and unmodified
directory copy. Instead, only the individual files that are modified need to be saved.
Before editing a file, copy the file, appending the extension you have chosen to the filename. I.e. if you were going to edit somefile.cpp
and have chosen the extension "fix", copy it to somefile.cpp.fix before editing it. Then edit the first copy (somefile.cpp).
After editing all the files you need to edit in this fashion, enter the directory one level above where your source code resides, and then
type
$ gendiff somedirectory .fix > mydiff-fix.patch
You should redirect the output to a file (as illustrated) unless you want to see the results on stdout.
SEE ALSO diff(1), patch(1)AUTHOR
Marc Ewing <marc@redhat.com>
4th Berkeley Distribution Mon Jan 10 2000 GENDIFF(1)