Path: utzoo!utgpu!water!watmath!clyde!rutgers!mailrus!nrl-cmf!cmcl2!brl-adm!umd5!uvaarpa!mcnc!ece-csc!ncrcae!ncr-sd!hp-sdd!ucsdhub!esosun!seismo!uunet!mcvax!ukc!stc!datlog!dlhpedg!cl
From: cl@datlog.co.uk (Charles Lambert)
Newsgroups: comp.software-eng
Subject: Re: Coordinating Software Development (long)
Keywords: configuration management, sccs, project control, RCS
Message-ID: <417@dlhpedg.co.uk>
Date: 9 Feb 88 14:07:15 GMT
References: <2457@orca.TEK.COM> <1713@ttidca.TTI.COM> <1315@vaxb.calgary.UUCP> <1664@desint.UUCP>
Sender: news@dlhpedg.co.uk
Reply-To: cl@.co.uk (Charles Lambert)
Organization: FSG@Data Logic Ltd, Queens House, Greenhill Way, Harrow, London.
Lines: 15

In article <1664@desint.UUCP> geoff@desint.UUCP (Geoff Kuenning) writes:
>  RCS even provides the "-j" switch to help you merge that fix back into
>the main branch later.
>
>I believe you can also do this with SCCS, though I haven't personally
>created an SCCS branch while another revision was actually checked out.

Indeed you can:  for merging, SCCS provides the -i option to include deltas
that are in another branch. That is the basis of the integration and
reconcilliation mechanisms in the prototype system I described (see past
articles).  It's a primitive facility,  though,  being unavoidably stupid
about colliding changes (except where two deltas delete the same line).

------------------
Charles Lambert		Data Logic UK Ltd, Harrow, England