[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 15:18:41 -0700
User-agent: Mutt/1.3.6i

On Wed, Apr 11, 2001 at 06:06:22PM -0400, Eric Siegerman wrote:
> On Wed, Apr 11, 2001 at 02:27:15PM -0700, Mike Castle wrote:
> > 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.
> Not too hard to do in CVS once you know how.  Granted, you have
> to take those steps *before* typing "cvs update"; it doesn't stop
> to ask you.  (No, I'm not suggesting it should!)

Oh, true.  delete your file, or keep a backup copy of it before hand.

But sometimes, if you know there is going to be this type of issue, that
cvs would stop to ask you.  But as I said, it's rare that you actually need
that function, and probably not worth trying to code in.  :->

       Mike Castle       Life is like a clock:  You can work constantly
  address@hidden  and be right all the time, or not work at all and be right at least twice a day.  -- mrc
    We are all of us living in the shadow of Manhattan.  -- Watchmen

reply via email to

[Prev in Thread] Current Thread [Next in Thread]