Path: utzoo!attcan!uunet!zephyr!tektronix!orca!anvil!stank
From: stank@anvil.WV.TEK.COM (Stan Kalinowski)
Newsgroups: comp.software-eng
Subject: Re: Re: Source Code Control
Message-ID: <3777@orca.WV.TEK.COM>
Date: 5 Jul 89 01:34:56 GMT
References: <133@tirnan.UUCP> <9630003@hpirs.HP.COM>
Sender: nobody@orca.WV.TEK.COM
Reply-To: stank@anvil.WV.TEK.COM (Stan Kalinowski)
Organization: Tektronix, Inc., Wilsonville, OR
Lines: 17

In article <9630003@hpirs.HP.COM> runyan@hpirs.HP.COM (Mark Runyan) writes:
>If NSE solves this problem to handle the merge automatically, I'd like
>to know how its done.  (Of course, it may be a company secret for SUN,

I don't know how NSE solves it, but, we had Apollo present DSEE here
and it looked like their system used regular 'ol "merge" or
"rcsmerge".  Do a man on these if you have RCS on your system.  Of
course, they may be using their own propriatary implementations, but
the functionality seemed to be the same as "merge". (i.e. it asked for
help when the changes overlapped.  There was no language dependant
checking for things like variable reuse etc.)

								stank
US Mail: Stan Kalinowski, Tektronix, Inc., Interactive Technologies Division
         PO Box 1000, MS 61-028, Wilsonville OR 97070   Phone:(503)-685-2458
e-mail:  {ucbvax,decvax,allegra,uw-beaver}!tektronix!orca!stank
    or   stank@orca.WV.TEK.COM