From owner-freebsd-hackers  Sat Jun  8 16:13:42 1996
Return-Path: owner-hackers
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id QAA04272
          for hackers-outgoing; Sat, 8 Jun 1996 16:13:42 -0700 (PDT)
Received: from time.cdrom.com (time.cdrom.com [204.216.27.226])
          by freefall.freebsd.org (8.7.5/8.7.3) with ESMTP id QAA04215;
          Sat, 8 Jun 1996 16:13:34 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1]) by time.cdrom.com (8.7.5/8.6.9) with SMTP id QAA01671; Sat, 8 Jun 1996 16:09:01 -0700 (PDT)
To: Garrett Wollman <wollman@lcs.mit.edu>
cc: Nate Williams <nate@sri.MT.net>, hackers@freebsd.org (FreeBSD Hackers),
        freebsd-stable@freebsd.org (FreeBSD Stable Users),
        FreeBSD-current@freebsd.org (FreeBSD current users)
Subject: Re: The -stable problem: my view 
In-reply-to: Your message of "Sat, 08 Jun 1996 14:19:15 EDT."
             <9606081819.AA02548@halloran-eldar.lcs.mit.edu> 
Date: Sat, 08 Jun 1996 16:09:00 -0700
Message-ID: <1668.834275340@time.cdrom.com>
From: "Jordan K. Hubbard" <jkh@time.cdrom.com>
Sender: owner-hackers@freebsd.org
X-Loop: FreeBSD.org
Precedence: bulk

> 1. You make a change on the head.  It gets rev 1.42.
> 2. You merge it into the branch with `cvs update -j1.41 -j1.42'.
> 3. You make another change on the head.  It gets rev 1.43.
> 4. You merge it into the branch with `cvs update -j1.42 -j1.43'.

Yes, this is essentially how I do it now (well, I tend to batch the
merges so it's not just one version being brought over at a time), I'm
just saying that I shouldn't *have* to remember what changed when - I
want an SCM tool which supports the concept of repeated merges, plain
and simple, and does this kind of grunt-work *for* me.

					Jordan