Date: Sat, 08 Jun 1996 16:09:00 -0700 From: "Jordan K. Hubbard" <jkh@time.cdrom.com> 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 Message-ID: <1668.834275340@time.cdrom.com> In-Reply-To: Your message of "Sat, 08 Jun 1996 14:19:15 EDT." <9606081819.AA02548@halloran-eldar.lcs.mit.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1668.834275340>