From owner-freebsd-hackers  Tue Mar 19 02:49:48 1996
Return-Path: owner-hackers
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id CAA20780
          for hackers-outgoing; Tue, 19 Mar 1996 02:49:48 -0800 (PST)
Received: from nixpbe.pdb.sni.de (mail.sni.de [192.109.2.33])
          by freefall.freebsd.org (8.7.3/8.7.3) with ESMTP id CAA20775
          for <hackers@freebsd.org>; Tue, 19 Mar 1996 02:49:33 -0800 (PST)
Received: (from nerv@localhost) by nixpbe.pdb.sni.de (8.6.12/8.6.12) id LAA00671 for hackers@freebsd.org; Tue, 19 Mar 1996 11:49:02 +0100
Message-Id: <199603191049.LAA00671@nixpbe.pdb.sni.de>
Subject: How to develop software and track current?
To: hackers@freebsd.org (FreeBSD hackers)
Date: Tue, 19 Mar 96 11:46:24 MET
From: Greg Lehey <lehey.pad@sni.de>
Cc: current@freebsd.org (Users of FreeBSD -current)
X-Mailer: xmail 2.4 (based on ELM 2.2 PL16)
Sender: owner-hackers@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

I'm currently about to start some active work on the ISDN software,
and I face a problem: I'm also tracking -current.  How to I ensure
that I get my updates to -current and also maintain the modifications
I make to the ISDN software?  The problem is compounded by the fact
that I don't get on very well with cvs, so if the following text
contains nonsense, please be nice :-) I can see a number of
possibilities:

1.  Create a new cvs tag, say "2.2-CURRENT-grog", and put all my
    changes there.  The problem I anticipate here are that I won't be
    able to automatically track the ctm updates.

2.  Check my changes in to 2.2-CURRENT every evening.  This seems to
    have a number of potential problems: first, if I forget to check
    in, I lose my updates, and secondly, somebody else might check in
    files which I have changed.  Presumably the latter action would
    cause the cvs update to blow up.

3.  Create a new directory outside the control of cvs.  This sounds
    like a real kludge.

This is obviously a problem that a lot of people have already solved,
at least to their own satisfaction.  If we can come up with a clean,
consistent way of doing it, I'll gladly contribute some documentation
on the subject.

Greg