Re: new svn command/feature

"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.

> * 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$

-K
Received on Sat Oct 21 14:36:12 2006