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.
?p 0 @ ?h 0 ?x +
{ O0 3 " B " B 1 " n B " 4 8 " @ 0B l @
*" WO + + O@Yb @@ @@ , x " Ra` @ + C $XD $
2 " Ra` @ + G $ 2`b + L $ 2ab + K`` @ + L+ Z + + D $ XD d @ + >d` @ <+ >,> ,> ,> " R $ 2`b + ,^ ,^ ,^ ,~ L H H H H H * H W H cHW cX ` c`D cx a d
dN d R d0 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 $ 4 2 $ 5 2`b + 9, P D + Ng O $ < 2, P6@ m d + N $ ? 2@@ Y@@ Y@@ Z!$ D W $ @ 2`b + D DX $ G 2 X , -!$ D W " R $ J 2`b + D D` $ M 2\$ ' D Z!$@ D W $ P 2`b + 0 DYa, P, , k, 4, '+ N\" Q, Y\"Yb$ R & J, N$ S4D q.$ D $ D $ S J, N $ D @ D \"Yb, Y\" T, Y \"Yb , V\"Yb, Y\" V, Y\"YbO !& H4 V\"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 $ g 2 X , -@@ Z!$ D W " R $ k 2`b + o D` $ r 2 ` , -!$@ D W " R $ t 2`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 , 5B Vd , ; ` 2"` + w , ; X 2"X + x ` X 2"` 3$X + 7 0D + F\" z + L5D H\" } + L\" " & J` \" 7` + T\" 0D + Q\" + T " & J` \" \" ,~ `` l , 4 , 4 ` \` X \X ` \ n X \ o
, B , B , D , D ` X , "4B r`` 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*
X 2jX + , 3 , 3+ 7d , D X $ , (5" , ; X 2"X + q+ , ;`` + p X \ oa` + , x , ;`` + p X 3D + S , D ` X , 4B 4 , ; ` 3"` + `` + O ` \` o \X `` + )i` + \" X \ 7 Yb+ 2> X , , Yb\$ Z@ + , x , x+ ` \ n X \ o , ; , ;`` + p X 3D + B , D , D ` X , 4B 6 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: X a` + o , x , 3+ \" , ` \` , T7"Yb+ u 4 u , b,~ , n+ u-< B , D ( 3D + ~ , ;a` + y , ;,~ -< B , D Yb\( @ ( 3D + , ;a` + , ;,~ -< d 2"` + 82$X + 2
( 2B0 + : : `B + 1B + 4B 1B " 0B 1B a + + + 20D 1D a + l + 21D $ 0D 1D a + ! + + 2-<
B D , 5B : : =n $,~ -<
( 2B0 + .: : `B + )@ ,~ Q*A`Q,A` 3B + /5D 2 " ,~ O ,~ g -< B ( / " .( 5& S X( .F( .F( ( *",~ d : 2d + : 2F ;+ A!& . RF : ,~ : 2d > ,~ -< B ( . 3"( ,~ 7 ( ,~
( ., 2,( + <
( M( Q,A` , b+ =B 0B 1B + P1B
B
( 2,( ,~ 0 Q.A` 5B @9
V-< [ 1DQ"A` B 5B A,~ -< b \"~ & J, N\"~+ Y B 6B + B? + h 4B c1B + 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
`OR REDIT ` H
?NOT A DEFINED COMMAND
\" + >
?NOT CONFIRMED
\" + >REDIT> COMPARE EXIT FAILED-CHANGES HELP MERGE MINIMUM NOVERIFY UNMERGE VERIFY TO FILE @ H %RED NAME OF OUTPUT FILE FOR FAILED CHANGES @ H '
?INVALID DESTINATION FILE, \" - , + > LINES TO MATCH @ H 2
?NOT A DECIMAL NUMBER
\" 6 + >CHANGE CONTEXT @ H :NEW SOURCE FILE @ H =@ H =
?INVALID SOURCE FILE, \" A , + >WITH FILE @ H FOLD VERSION OF SOURCE @ H HCHANGES TO @ H LCHANGE FILE @ H NREDIT 0$ 1$ 1 D 1 COMPARE by user , , N+ ~
File 1:
File 2:
CHANGES FROM @ H [REDIT CHANGE FILE @ H ]
?INVALID CHANGE FILESPEC, \" a , + >WITH SOURCE @ H fSOURCE TO BE UPDATED @ H h
?INVALID SOURCE FILESPEC, \" l , + >TO @ H qNEW SOURCE @ H s , 4+ > , 4+ @There was one change found There were no changes found There were changes found ,
of which one was superfluous were superfluous .
JX d + 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$X g O ,~ > l ,~
( L( + J ( , NO@( ,~ , n+ X, n+ \@@ + B " + g@@Y`, p+ nH W`
COPYRIGHT (c) DIGITAL EQUIPMENT CORPORATION 1988.
ALL RIGHTS RESERVED.
" " "\" " U$ @ + + \" " ,~ , N <\" # + V. p 5> ^,>p , p + ],^ / : x ,~ ,^ / ,~ / p P p ,> %/ &`|+ _+ Y?p ,>p , p + f,^ "` >p : x + h,^ "` >p ,~ ,> . p 5> m, p + & Z ,^ : x ,~ ,> Z p >w h + j,> ?p , p + u Z ,^ : x + v Z ,^ ,~ ,> > h h , p + & Z ,^ : x ,~ ,> > h h , p + (h h Z ,^ : x ,~ : x ,~ ,> , p 7 : ,^ ,~ ,> ,> , p 7 : ,^ ,^ ,~ >
~, p 7 : ~
~>~,~ >
|}~, p 7 : |~}
|>|,~ ,> . p 5> , p + * : ,^ " Z\,^ ?x + p ,> Z p >w h +
? JSYS ERROR:
PROGRAM CANNOT CONTINUE
Z ,^ ,~ h h Z ,^ ,~ + 6 + 6`+ E S p E ? r C0r b C0r co[ hi; k>#s X>#_ Zkd kb
kb
ka ka E[ |?; IY O` G +OX O Lsx O Ls| O LLz H IDlx OYn OYv OXt OXlr OXXp H IDYn ORsX ORq` OR^^ ORK\ OR8Z H IDXX OLSb OLRl OL@j OL<h OL*f OLd H IDXb OF3J OF3V OF!T OF R OF
P OF N OEwL H IDWJ Pzd" OTI@ WHo WHmU WHmQ WHl3 ~O< x O%?OLZWWB!X Pk" P im m z OE0^ OE . OEW OD~w OD=w ?OD: OD9V OD9
OD9
OD9 OD9 OD9
OD9
OD9 OD9 OD9
OD9
OD9 OD9 OD9 OD9 OD9 OD9 OD7, OD7 OD3Q OD17 OD,' >OD, ?>9[ v>3; yP Hhf P Hhe P Hhe P Hg m P.W uPJ vW uPJ uW uP7 hW uP7 fH Jd Hfb Hel HRj H>h H+f H JoL HFJ HFV H3T H R H P H
N O qFx O qF| O q z O q&n O q&v O qt O p}r O php HrXZ O kX O jt` O j`^ O jL\ H J
p H+n H+v H*t H*lr H JxZ H$sX H$q` H$^^ H$K\ H Jcd H Sb H Rl H @j H <h H *f H JOL H3J H3V H!T H R H
P H N O F
sx O F
s| O F
Lz LA$5C AP N:p N9 r _q$ mmzt9 jVS$ ^VS _VSM YVSX ] 8Q 1;,~ M',2 M'*h M'(@ M&~( M&rI @ M&Nt M&N M&<] M&<\ M&4
M&/D M&-) V z!r V
T, V z )0 N
St , NS1&D D i })m! D D zo4 Vznt 4 N J " hX RD89w+ z#, 897f F IY On
I Omg OOrc OOqh O9RH Pzd" O/g OX O { O rJ O eM Pk" O/L` OO> ON`w ON } ONK] ON@^ ON@I ON36 ON- ONk OE!" ODp ODJG ODF* W u]
"W u] W u\x W u\u W u\u W uWb W uWa W uWN W uWN W uW; ~W uW: yW uW' uW uW oW uW fW uV eW uVl \W uVi JW uVV )W uQC W uQ0 W uQ/ W uQ, TW uQ QW uQ TW uQ LW uPt HW uPs LW uPs FW uP^ qW uP] KW uP8 GW uP5 CP J 3@X S3t P qJ P qI P qI .c4: RP K3x ~FPK N.G[
P KL <U% a)V6m D7]K ` Jpy WP oM P o= IO kIJ* V I-+ N9Xh x N9WF| N9& P ?" Pb K "P^x3 9\ pP =T P`T P ;l0@ Z Z Y Y V`2H YbV\&* xV[9 \= Ye 2 9s QM 2 8( O%] 3}]/ 4P 9:7 MP" -MP" .PvAp t!y (sw- lsw& sv stK B 9&
q 9&
u 9& h 9& a 9&
U 9&
" 9& 6sri Osrh ? 9& 4 9& 7- P 9 N UKOm P 8, Pr. $c YvUVH
k.&? HP 0c {YWh ] 0 J J LH ` XkM P
P /?t >@P /? =>zD -J m r8a>D T8a8 FT+#Nh d
X / P
X * @
T, Vz |" z );
St , NKzK
$
:zW
'on
:kY 3
:kY 2P &5& S_tKd P |1K &': p &': o &'9 o &'9 nP | L ^g\B xP {u S^! f0B VE$X, c l <
l
K1+G\ +EfS
WfB WK+lu_ K+lmg K+lj, K+l>@ K+l9 !gA hP h7 Hc[
z E
y P
y K # DH ' z|, W` z|! U` z|! S` pZI v qp
ajB %" ] %" i %! e %! V_Z: j_'g b
( 1_s f_jJ ^ o; [ S nMh; P)MG 2'.
%l 7 Ty 4JLM JLzU JLmf` #ll w: r w: q w9 q w9 p ,A c T( b N B RRD{. ( N RD89w+ z#, gy B8\ y Ags ; |! . |! $P]\ O O J TJ+ O[k O[k O[j] O[jR O[i% r%H ([Z [X %[Qg r% 0[Ms /[M" -[M +[L ,[FG [@v *r#e OD^w'l w]!+{ 0