etsf_io(1) [debian man page]

ETSF_IO(1)							   User Commands							ETSF_IO(1)

NAME

       etsf_io - manual page for etsf_io

SYNOPSIS

       etsf_io [-h | -a action] [[-i file]...] [[-f flag]...]

DESCRIPTION

       [-o file] [arguments]

       Handle ETSF files, see --action option.

       -h --help	     : show this little help.

       -a --action value     : give the action to perform.

       Possible action may be: * 'merge' to gather several files that have been splitted.

       * 'content' to get the name of specifications the file matches.

       * 'check' to check the validity of the file against specifications.

       -o --output-file file : give the path to the output ETSF file.

       -i --input-file file  : give the path for an input file. This option can be used one or several times.

       -l --list	     : when action is check, it give the list of available flags.q

       -f --flag value	     : give a flag name (get valid names from -l option).

       Examples:

       Merge three files, etsf_io -a merge -i file1.nc -i file2.nc -i file3.nc -o output.nc

       Get the contents of file test.nc, etsf_io -a content test.nc

       Get the list of flags for validity checks, etsf_io -a check -l

       Checks with two flags, etsf_io -a check -f flag1 -f flag2 test.nc

SEE ALSO

       The  full  documentation  for  etsf_io  is maintained as a Texinfo manual.  If the info and etsf_io programs are properly installed at your
       site, the command

       info etsf_io

       should give you access to the complete manual.

etsf_io 							   November 2011							ETSF_IO(1)

merge(1)						      General Commands Manual							  merge(1)

NAME

       merge - three-way file merge

SYNOPSIS

       file1 file2 file3

DESCRIPTION

       combines  two  files  that are revisions of a single original file.  The original file is file2, and the revised files are file1 and file3.
       identifies all changes that lead from file2 to file3 and from file2 to file1, then deposits the merged text into file1.	If the	option	is
       used, the result goes to standard output instead of file1.

       An  overlap  occurs  if both file1 and file3 have changes in the same place.  prints how many overlaps occurred, and includes both alterna-
       tives in the result.  The alternatives are delimited as follows:

	      lines in file1
	      lines in file3

       If there are overlaps, edit the result in file1 and delete one of the alternatives.

       This command is particularly useful for revision control, especially if file1 and file3 are the ends of two branches that have file2  as  a
       common ancestor.

EXAMPLES

       A typical use for is as follows:

	      1.   To  merge  an  RCS branch into the trunk, first check out the three different versions from RCS (see co(1)) and rename them for
		   their revision numbers: 5.2, 5.11, and 5.2.3.3.  File 5.2.3.3 is the end of an RCS branch that split off the trunk at file 5.2.

	      2.   For this example, assume file 5.11 is the latest version on the trunk, and is also a revision  of  the  "original"  file,  5.2.
		   Merge the branch into the trunk with the command:

	      3.   File  5.11  now  contains  all  changes  made on the branch and the trunk, and has markings in the file to show all overlapping
		   changes.

	      4.   Edit file 5.11 to correct the overlaps, then use the command to check the file back in (see ci(1)).

WARNINGS

       uses the ed(1) system editor.  Therefore, the file size limits of ed(1) apply to

AUTHOR

       was developed by Walter F. Tichy.

SEE ALSO

       diff3(1), diff(1), rcsmerge(1), co(1).

																	  merge(1)