From owner-freebsd-lite2  Mon Aug 19 12:20:09 1996
Return-Path: owner-lite2
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id MAA02689
          for lite2-outgoing; Mon, 19 Aug 1996 12:20:09 -0700 (PDT)
Received: (from hsu@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id MAA02683;
          Mon, 19 Aug 1996 12:20:07 -0700 (PDT)
Date: Mon, 19 Aug 1996 12:20:07 -0700 (PDT)
From: Jeffrey Hsu <hsu>
Message-Id: <199608191920.MAA02683@freefall.freebsd.org>
To: peter
Subject: Re: cvs tree preperation.. 
Cc: lite2
Sender: owner-lite2@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

  > 3: like #2, but place explicit markers on the current branch and use those
  > for merging

This is close to what I do locally.

  > 4: Give p3 a shot (http://www.p3.com).

I'm game if it's okay with everyone else.  I've always wanted to try
out p3 and this will force me to do so.

So, either 3 or 4 is okay with me.