REFUSE
NAME
refuse - recuperation et fusion d'une serie d'experiences.
- (recuperate and merge a set of experiments)
USAGE
refuse
or
refuse -v1 path1 [-v2 path2 ... -v9 path9] [-strip]
PARAMETER DEFINITION
path1 -path of the first directory to search. This parameter is
required.
path2-9 -paths to the other directories to search.
-strip -with this key present, the file resulting from the merge
will only contain code lines; all fortran type comments and
empty lines will have been removed.
EXAMPLE
We wish to merge the experiments of three users. The experiments are
found in the following directories:
/user1/experiment1
/user2/experiment2
/user3/experiment3
The contents of the above directories are:
ls /user1/experiment1
module1.ftn module2.ftn abc.cdk xxxx.f
ls /user2/experiment2
module3.ftn module4.ftn yyyy.c zzzz.h
ls /user3/experiment3
module1.ftn module3.ftn xyz.cdk
We see that we have two different versions of module1.ftn and
module3.ftn that will have to be merged.
To recuperate all the files from the above directories, we enter the
command:
refuse -v1 /user1/experiment1 \
-v2 /user2/experiment2 \
-v3 /user3/experiment3
After execution, we will find in the current working directory a copy
of all the files (*.ftn, *.ptn, *.f, *.cdk, *.c, *.s and *.h) contained in the
three directories selected:
module1.ftn, module2.ftn, module3.ftn, module4.ftn,abc.cdk xyz.cdk
xxxx.f yyyy.c and zzzz.h
In addition, a file named confusion will have been created by refuse.
confusion contains a list of all the files for which a merge had to be
performed (in our example, module1.ftn and module3.ftn) and the number of
overlaps that occurred during the merge. The confusion file has the following
format:
*************************************************************
MERGING THE 2 VERSIONS OF module1.ftn
module1.ftn__Version1 module1.ftn__Version3
Warning: 1 overlaps during merge.
Warning: 1 overlaps during merge.
*************************************************************
In the resulting module1.ftn file, regions where an overlap has
occurred are identified using the following convention:
<<<<<<< merge1
contents of first version of module1.ftn
=======
different contents found in second version of module1.ftn
>>>>>>> module1.ftn__Version3
AUTHOR
James Caveen - RPN - december 1991
Latest revision: November 1993
NOTES
refuse must be executed from an empty working directory since any
local file having the same name as a file being recuperated will be
overwritten.
refuse used in conjunction with sor_exp provides a relatively easy
method to recuperate and merge the modifications brought by many users (up to
nine) to a set of source files. It is then the responsibility of the refuse
user to eliminate conflicting code from the regions where overlaps occurred.
See also clt_exp(1), cltr_exp(1), dir_exp(1), eff_exp(1), frm_exp(1),
grep_exp(1), hst_exp(1), make_exp(1), mdm_exp(1), menu_exp(1), mrcs_exp(1),
omd_exp(1), omdr_exp(1), ouv_exp(1), qui_exp(1), rev_exp(1), smod_exp(1),
sor_exp(1) and etagere(1), co(1), merge(1), rcsmerge(1), diff(1), diff3(1).