[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: new svn command/feature

From: Lee Burgess <lefty_at_red-bean.com>
Date: 2000-10-20 20:57:54 CEST

Karl Fogel writes:
> "B. W. Fitzpatrick" <fitz@red-bean.com> writes:
> > Actually, I had envisioned it as Adding and Removing, not checking in.
>
> That's what I assumed, too.

Oh, okay. That makes more sense when I think about it. :) I think I
was infering more than Fitz was implying regarding that functionality.

> > * Note, that if you were to do an update at this point, bar.c would be
> > pulled from the repository
>
> If bar.c is locally removed, then there's a conflict if it has changed
> in the repository since the version you removed locally. The conflict
> will be expressed when you update.
>
> We should behave the way CVS does here. Below, I cvs rm'd a file foo
> that was not up-to-date, and then updated:
>
> prompt$ cvs server: Updating .
> prompt$ cvs server: conflict: removed foo was modified by second party
> C foo
> prompt$

Makes sense.

> -K

-- 
Lee P. W. Burgess  <<!>>  Manipulate eternity. Power is a symphony:
Programmer         <<!>>  elaborate, enormous, essential.
Red Bean Software  <<!>>  Dream the moment with a fiddle in summer 
lefty@red-bean.com <<!>>  and a knife in winter.
Received on Sat Oct 21 14:36:12 2006

This is an archived mail posted to the Subversion Dev mailing list.