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 NETBSD
rcorder
RCORDER(8) BSD System Manager's Manual RCORDER(8)NAME
rcorder -- print a dependency ordering of interdependent files
SYNOPSIS
rcorder [-k keep] [-s skip] file ...
DESCRIPTION
rcorder is designed to print out a dependency ordering of a set of interdependent files. Typically it is used to find an execution sequence
for a set of shell scripts in which certain files must be executed before others.
Each file passed to rcorder should be annotated with special lines (which look like comments to the shell) which indicate the dependencies
the files have upon certain points in the sequence, known as ``conditions'', and which indicate, for each file, which ``conditions'' may be
expected to be filled by that file.
Within each file, a block containing a series of ``REQUIRE'', ``PROVIDE'', ``BEFORE'' and ``KEYWORD'' lines should appear. The format of the
lines is rigid. Each line must begin with a single ``#'', followed by a single space, followed by ``PROVIDE:'', ``REQUIRE:'', ``BEFORE:'',
or ``KEYWORD:''. No deviation is permitted. Each dependency line is then followed by a series of conditions, separated by whitespace. Mul-
tiple ``PROVIDE'', ``REQUIRE'', ``BEFORE'' and ``KEYWORD'' lines may appear, but all such lines must appear in a sequence without any inter-
vening lines, as once a line that does not follow the format is reached, parsing stops.
The options are as follows:
-k Add the specified keyword to the ``keep list''. If any -k option is given, only those files containing the matching keyword are
listed.
-s Add the specified keyword to the ``skip list''. If any -s option is given, files containing the matching keyword are not listed.
An example block follows:
# REQUIRE: networking syslog
# REQUIRE: usr
# PROVIDE: dns nscd
This block states that the file in which it appears depends upon the ``networking'', ``syslog'', and ``usr'' conditions, and provides the
``dns'' and ``nscd'' conditions.
A file may contain zero ``PROVIDE'' lines, in which case it provides no conditions, and may contain zero ``REQUIRE'' lines, in which case it
has no dependencies. A file containing no ``PROVIDE'', ``REQUIRE'', or ``BEFORE'' lines may be output at an arbitrary position in the depen-
dency ordering.
There must be at least one file with no dependencies in the set of arguments passed to rcorder in order for it to find a starting place in
the dependency ordering.
DIAGNOSTICS
rcorder may print one of the following error messages and exit with a non-zero status if it encounters an error while processing the file
list.
Requirement %s has no providers, aborting. No file has a ``PROVIDE'' line corresponding to a condition present in a ``REQUIRE'' line in
another file.
Circular dependency on provision %s, aborting. A set of files has a circular dependency which was detected while processing the stated con-
dition.
Circular dependency on file %s, aborting. A set of files has a circular dependency which was detected while processing the stated file.
SEE ALSO rc(8)HISTORY
The rcorder program first appeared in NetBSD 1.5.
AUTHORS
Written by Perry E. Metzger <perry@piermont.com> and Matthew R. Green <mrg@eterna.com.au>.
BSD April 23, 2003 BSD