Google
 

Trailing-Edge - PDP-10 Archives - bb-m836d-bm - tools/redit/redit.exe
There are 9 other files named redit.exe in the archive. Click here to see a list.
?p0@?h0?x+
{O03 " B  " B  1 "n B  " 48 " @0Bl @ 
*" WO	+ 	+ O@Yb @@ @@ ,x " Ra`@+C $XD $
2 " Ra`@+G $2`b+L $2ab+K``@+L+Z++D $ XDd @+>d`@<+>,>,>,> " R $2`b+,^,^,^,~L HH H HH *H WHcHWcX`c`Dcxad
dNd Rd0	d@S,P<+N,P\"c+N
REDIT is used to duplicate changes which have been made in source
files.  If there is a source A and a modified version A', and
we wish to make the same modifications to a related source B so
as to produce B', the following steps are performed:

1. COMPARE A' with A to produce the changes file C.

2. MERGE the changes file C with source B to produce B'.

This assumes that A and B are similar, perhaps derived from
a single source via different development paths.  In particular,
the areas which were modified in A to produce A' must be
present in B.  If this is not so, an error message will be
produced during the MERGE for any change which could not
be duplicated.  This typically occurs because changes were made
in the same areas in both A and B, and manual resolution of
the conflict is required.

The commands are:

"COMPARE" compares a "new source" with a previous version to
	produce a "changes file" which can be given to a subsequent
	"MERGE".

"MERGE" merges a "changes file" with a related source to
	produce a new version of the source.

"UNMERGE" removes the changes represented by a "changes file"
	from a source.  This undoes the effects of a MERGE
	of the same changes file.

"MINIMUM" sets the number of lines of 'context' to be found
	for each change.  The number of lines of text preceding
	the actual change will be included in the changes file.

"FAILED-CHANGES" specifies an output filespec to be used during
	the next MERGE or UNMERGE operation.  Any changes which
	are not found will be written to this file in standard
	RED format so that additional attempts at merging
	these changes may be made.

"VERIFY" is effective only during a MERGE or UNMERGE command.  It causes
	REDIT to verify that the context for each change is not
	ambiguous by searching the entire file for the context.
	The context must be found exactly once.  If it is found
	multiple times, the change is flagged as ambiguous as
	is not made.  "NOVERIFY" causes REDIT to accept the first
	matching context found and not check for multiple matching contexts.

Definition: A superfluous difference is one which exists only
	because blanks have been added to or removed from the
	end of lines.

 $&2@@ Y@@ Y\$' D Z!$@ D W $+2`b+0,P DYb Yb 2,V+N $42 $52`b+9,P D +NgO $<2,P6@m d +N $?2@@ Y@@ Y@@ Z!$ D W $@2`b+D DX $G2 X,-!$ D W " R $J2`b+D D` $M2\$' D Z!$@ D W $P2`b+0 DYa,P, ,k,4,'+N\"Q,Y\"Yb$R &J,N$S4Dq.$ D $D$SJ,N $D@D\"Yb,Y\"T,Y \"Yb,V\"Yb,Y\"V,Y\"YbO!&H4V\"Yb,Y\"W,Y\"Yb ` 	
\"Yb,Y\"Y,Y\"Yb X 	
\"Yb,Y\"Z,Y,~$@m d  $\2@@ Y@@ Y\$' D Z!$ D W $_2`b+d DX $g2 X,-@@ Z!$ D W " R $k2`b+o D` $r2 `,-!$@ D W " R $t2`b+0 DYa,P, ,,'+N ` v,V X v,V Ya 2,V@@`@@X+v,p Ya	+ 6"`	+ 6"X	+ ,~-< B!,\02 B0 Y  03
*l.,~ b f -<l d  v B` BX ,D ,D ` X,	5BVd  ,; `2"`+w ,; X2"X+x ` X2"`3$X+7  0D+F\"z+L5DH\"}+L\" "    &J`\"7` +T\"  0D+Q\"+T "  &J`\"\",~``l  ,4 ,4 ` \` X \X ` \ n X \ o 
  ,B ,B ,D ,D ` X,"4Br``m`d  
X> ` ,"4B	2j o+e 
`>  X,"4B
2j n+i=l]\"
\", &J,N\"<\",Y: ,]\",Y[`,]\",YZ`,]\",Y[X,]\",YZX,]e`+: \",Y ",nd`+ ,; ,; ,T "
 n*
`2j`+ 
 o*
X2jX+ ,3 ,3+7d   ,D X $,(5" ,; X2"X+q+ ,;``+p X \ oa`+ ,x ,;``+p X 3D+S ,D ` X,	4B4 ,; `3"`+`` +O ` \`  o \X``+)i`+\" X\7 Yb+2>X , , Yb\$Z@+ ,x ,x+ ` \ n X \ o ,; ,;``+p X 3D+B ,D ,D ` X,	4B6  n \`  o \X+"a`+Ua` +J ` \`  o \X\"! X\\"#+2  n \ p  o \ q ` \ q X \ rl  +?  p \ n  q \ o  q \`  r \X+U ` \ n X \ oa`+\\"&  o\\"& ,T ,3+l ,; `* n3b`+a B` ,T  n \` ,3a`+e  o \X+f ,; ,3 X \ o ,D X 2D+) ,T:Xa`+o ,x ,3+\", ` \` ,T7"Yb+u	4u ,b,~,n+u-< B ,D ( 3D+~ ,;a`+y ,;,~-< B ,D Yb\(@ ( 3D+ ,;a`+ ,;,~-<d 2"`+82$X+2 
 
(2B0+::`B+1B+4B1B "0B1Ba+++20D1Da+l +21D $0D1Da+!++2-<
 B D    ,	5B::=n$,~-< 
 
 (2B0+.::`B+)@,~Q*A`Q,A`3B+/5D2 ",~O,~g  -< B (/".(5&SX(.F(.F( (*",~d :2d+:  2F;+A!&.RF:,~:2d>,~-< B (. 3"(,~7 (,~ 
(.,2,(+< 
(M(Q,A`,b+=B0B1B+P1B
 B 
(2,(,~ 0Q.A`5B@9
V-<[1DQ"A` B5BA,~-<b \"~ &J,N\"~+Y B6B +B?  +h 4Bc1B+c1B+C+7" ,~
`d,~  Q$A` D "&
.&
 F +c? Y`+DBYa,~-<b B Ya\$W`"&
.Y`,v ,~ "
 BY` F BYa,~ 8 r 6 y "! B` B` B` " BX BX BX "$ B` "! BX "$  B` B` "  B` "  BX BX "S` BX "S` B` "U` BX,~ " U$@+ + \"Z,~|Yv
`ORREDIT`H
?NOT A DEFINED COMMAND
\"+>
?NOT CONFIRMED
\"+>REDIT>COMPAREEXITFAILED-CHANGESHELPMERGEMINIMUMNOVERIFYUNMERGEVERIFYTO FILE@H%REDNAME OF OUTPUT FILE FOR FAILED CHANGES@ H'
?INVALID DESTINATION FILE, \"-,+>LINES TO MATCH@H2 
?NOT A DECIMAL NUMBER
\"6+>CHANGE CONTEXT@H:NEW SOURCE FILE@H=@ H=
?INVALID SOURCE FILE, \"A,+>WITH FILE@HFOLD VERSION OF SOURCE@ HHCHANGES TO@HLCHANGE FILE@ HNREDIT 0$1$1D1 COMPARE by user , ,N+~
File 1: 
File 2: 
CHANGES FROM@H[REDIT CHANGE FILE@ H]
?INVALID CHANGE FILESPEC, \"a,+>WITH SOURCE@HfSOURCE TO BE UPDATED@ Hh
?INVALID SOURCE FILESPEC, \"l,+>TO@HqNEW SOURCE@ Hs ,4+> ,4+@There was one change foundThere were no changes foundThere were  changes found,
 of which one was superfluous were superfluous.
 JXd +r J`d +r?APPARENT CHANGE OF At LEAST  LINES, FILES CANNOT BE COMPARED.
***** CHANGE #; PAGE , LINE  (superfluous) ---------------------------------
 ,;+
 ,;+
?FAILED TO FIND ?Ambiguous  - this change skipped.
% % has already been made.
 ,;``+p+h
?Unexpected EOF in differences file--probable missing ESC.
 Balance of source file will be copied to destination.
2$XgO,~>l ,~
 
( L(+J (	,NO@(,~,n+X,n+\@@ + B  "+g@@Y`,p+nHW`
COPYRIGHT (c) DIGITAL EQUIPMENT CORPORATION 1988.
ALL RIGHTS RESERVED.
 "   " "\"  " U$@+ + \"",~,N<\"#+V.p5>^,>p,p+],^/:x,~,^/,~/pPp,>%/&`|+_+Y?p,>p,p+f,^"`>p:x+h,^"`>p,~,> .p5>m,p+& Z,^:x,~ ,>Zp>w h+j,> ?p,p+u Z,^:x+v Z,^,~,> >hh,p+& Z,^:x,~,> >hh,p+(hh Z,^:x,~:x,~,>,p7:,^,~,>,>,p7:,^,^,~>
~,p7:~
~>~,~>
|}~,p7:|~}
|>|,~,> .p5>,p+* :,^"Z\,^?x+p ,>Zp>w h+
? JSYS ERROR: 
PROGRAM CANNOT CONTINUE
 Z,^,~hh Z,^,~ +6+6`+ESpE?rC0rbC0rco[hi;k>#sX>#_Zkdkb
kb
kakaE[|?;IYO`G+OX OLsxOLs|OLLzHIDlxOYnOYvOXtOXlrOXXpHIDYnORsXORq`OR^^ORK\OR8ZHIDXXOLSbOLRlOL@jOL<hOL*fOLdHIDXbOF3JOF3VOF!TOFROF
POF	NOEwLHIDWJPzd"OTI@WHoWHmUWHmQWHl3~O< xO%?OLZWWB!XPk"PimmzOE0^OE.OEWOD~wOD=w?OD:OD9VOD9
OD9
OD9OD9OD9
OD9
OD9	OD9	OD9
OD9
OD9OD9OD9OD9OD9OD9OD7,OD7OD3QOD17OD,'>OD,?>9[v>3;yPHhfPHhePHhePHgmP.WuPJvWuPJuWuP7hWuP7fHJdHfbHelHRjH>hH+fHJoLHFJHFVH3TH RHPH
NOqFxOqF|OqzOq&nOq&vOqtOp}rOphpHrXZOkXOjt`Oj`^OjL\HJ
pH+nH+vH*tH*lrHJxZH$sXH$q`H$^^H$K\HJcdHSbHRlH@jH<hH*fHJOLH3JH3VH!THRH
PH	NOF
sxOF
s|OF
LzLA$5C AP N:pN9r_q$mmzt9jVS$^VS_VSMYVSX]8Q1;,~M',2M'*hM'(@M&~(M&rI@M&NtM&NM&<]M&<\ M&4
M&/DM&-)Vz!rV
T,Vz)0N
St,NS1&D	D i})m!	DDzo4Vznt4NJ"hX RD89w+z#,897f FIYOn
IOmgOOrcOOqhO9RHPzd"O/gOXO{OrJOeMPk"O/L`OO>	ON`wON}ONK]ON@^ON@ION36ON-ONkOE!"ODpODJGODF*Wu]
"Wu]Wu\xWu\uWu\uWuWbWuWaWuWNWuWNWuW;~WuW:yWuW'uWuWoWuWfWuVeWuVl\WuViJWuVV)WuQCWuQ0WuQ/WuQ,TWuQQWuQTWuQLWuPtHWuPsLWuPsFWuP^qWuP]KWuP8GWuP5CPJ3@XS3t	PqJPqIPqI.c4:RPK3x~FPKN.G[
PKL<U%a)V6mD7]K`JpyWPoMPo=IOkIJ*V I-+N9XhxN9WF|N9&P?"PbK"P^x39\pP=T P`TP;l0@ZZYYV`2HYbV\&*xV[9\=Ye29sQM28(O%]3}]/4P9:7MP" -MP".PvApt!y(sw-lsw&svstKB9&
q9&
u9&h9&a9&
U9&
"9&	6sriOsrh?9&	49&7-P9NUKOmP8,Pr.$cYvUVH
k.&?HP0c{YWh]0JJLH`XkM P
P/?t>@P/?=>zD -J	mr8a>D T8a8FT+#Nhd
X/P
X*@
T,Vz|"	z);
St,NKzK
$
:zW
'on

:kY3
:kY2P&5&S_tKdP|1K&': p&': o&'9 o&'9 nP|L^g\BxP{uS^!f0BVE$X,cl <
l
K1+G\ +EfS
WfB WK+lu_K+lmgK+lj,K+l>@K+l9!gAhPh7Hc[ 
zE
yP
yK#DH'	z|,W`	z|!U`	z|!S`pZIvqp
ajB%"]%"i%!e%!V_Z: j_'g b
(1_s f_jJ ^o;[SnMh;P)MG2'.
%l7Ty4JLMJLzUJLmf`#ll	w: rw:qw9qw9p,AcT(bNBRRD{.(NRD89w+z#,gyB8\yAgs;|!.|!$P]\O	O	JTJ+O[kO[kO[j]O[jRO[i%r%H([Z[X%[Qgr%0[Ms/[M"-[M	+[L,[FG[@v*r#eOD^w'lw]!+{0