Re: Mergemaster+RCS

2004-01-16 Thread S . Yamagishi
$B1)?6$j$NNI$/$J$C$?$+$D$F$NIt2<$KD$r5-$7$?%O%k$N2s8\O?Iw$K(B $B$O!"(B"$B#1#0!s$N9XF~A}(B"$B!"(B"$BM}2r$r5a$a$k(B"$B$O;~4V2T$.$G!"2?$+$r1#$7$F$$$k>Z5r$H(B $B2rl$ON?$2$k$H;W$C$F$$$k!"A10U$KK~$A$?(B $B$O$$$k$,7hDj8"$NA4$/$J$$7/$_$?$$$J?M$HMh$F$O!"9T$+$J$$J}$,NI$$$K7h$^$C$F$$$k!#(B (B

Re: Mergemaster+RCS

2004-01-15 Thread Adrian Filipi
On Tue, 13 Jan 2004, Michael R. Wayne wrote: > > Although Doug Barton has written a wonderful tool, it has always > seemed to have a major deficiency: it completely ignores the > existance of RCS files. I've exchanged some email with Doug and > he has no interest in adding RCS support to mergemas

Re: Mergemaster+RCS

2004-01-14 Thread Michael W. Lucas
;know" the state of logfiles and > these tools should not be broken. > > This seems to work for us. Comments/suggestions welcome. > > /\/\ \/\/ > > > *** /usr/sbin/mergemaster Thu Jan 8 17:03:30 2004 > --- mergemaster+rcs Fri Jan 9 08:45:19 2004 &g

Mergemaster+RCS

2004-01-13 Thread Michael R. Wayne
s should not be broken. This seems to work for us. Comments/suggestions welcome. /\/\ \/\/ *** /usr/sbin/mergemaster Thu Jan 8 17:03:30 2004 --- mergemaster+rcs Fri Jan 9 08:45:19 2004 *** *** 8,20 # Copyright 1998-2003 Douglas Barton # [EMAIL PROTECTED]