[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: CVS bashing?
From: |
Mike Castle |
Subject: |
Re: CVS bashing? |
Date: |
Wed, 11 Apr 2001 14:27:15 -0700 |
User-agent: |
Mutt/1.3.6i |
On Wed, Apr 11, 2001 at 04:44:49PM -0400, Eric Siegerman wrote:
> > Merging is very primitive
>
> Hmmm. How could it be better? NOT a rhetorical question; I'd
> really like to know. (I haven't used the commercial ones he's
> comparing CVS to.)
I've recently started working at a perforce shop. One thing that perforce
does with it's merging is, instead of doing a default merge, it gives you
options:
Keep your changes only, keep the other set of changes only, or merge the
changes.
Granted, in my experience, 99% of the time you want to merge the changes.
But every once in a while, you don't. (and it's usually not determined by
a file type so you can't use cvswrappers to control it).
Otherwise, I've not been convinced that things like changesets where you
pick and choose which bits and pieces get included into a particular source
file (ala clearcase) is worth it. Just the administrative overhead would
be obnoxious! :->
One place I would like to see improvements is the ability to automatically
be able to track how branches were synced up together so that changes
aren't reapplied. Yes, this can be done easily with scripts. But having
to write scripts portable to various environments is a bit of a pain (ie,
making sure everyone has perl on their machines, or writing tools in Bourne
and batch, and so forth). It's a tough selling point at times to say "Yes,
we can easily work around that limitation, but we'll have to write a couple
of extra tools." (Ignoring the fact that no matter what SCM tool we use,
we're still going to have to write our own wrappers around it.)
mrc
--
Mike Castle Life is like a clock: You can work constantly
address@hidden and be right all the time, or not work at all
www.netcom.com/~dalgoda/ and be right at least twice a day. -- mrc
We are all of us living in the shadow of Manhattan. -- Watchmen
Re: CVS bashing?, Alexander Kamilewicz, 2001/04/18
Re: CVS bashing?, Paul Sander, 2001/04/11