Re: commit allowed without update first?

Ben Collins-Sussman <sussman@collab.net> wrote:
> On Wed, 2004-06-09 at 15:49, Jacques Carette wrote:
> > It has happened to me twice now that my changes were overwritten by a
> > colleague (we edited in parallel, I committed first, he commits second yet
> > is not forced to either update or merge).
> >
> > The subversion server and my colleague are both using a Linux flavor, but I
> > use TortoiseSVN [which should not matter at all, since the changes were
> > clearly recorded in the logs as being committed, seperated by at least 15
> > minutes of time].
> >
> > I thought that this was never supposed to happen?!
>
> It cannot happen. You'll need to show us details to make us believe
> you. :-)

And I got some of the details... my colleague saw the warnings about merging, and proceeded to ignore them!

My apologies to the list for the noise,

Jacques

PS: is there a feature whereby one can completely disallow unmerged commits? It should not be the default, but in
certain settings it would be appropriate.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 10 16:46:42 2004