On 10/9/07, Brian Erickson <erickson@bauercontrols.com> wrote:
> Since the ultimate goal is to delete the file, why would an update need
> to do anything?
An update should signal the fact that one user is updating the file
while apparently another thinks it's fine to delete it.
> Even so, having an unchanged file change from 'marked for deletion' to
> 'unversioned' seems like a good opportunity for improvement.
Did it go from marked for deletion to unversioned? That's an even
bigger bug, I'd say...
bye,
Erik.
> Brian
>
> > -----Original Message-----
> > From: Stefan Schulze [mailto:algroth@gmx.de]
> > Sent: Tuesday, October 09, 2007 7:30 AM
> > To: users@subversion.tigris.org
> > Subject: AW: Bug in svn update?
> >
> > > When you do an update, your the changes from the repository
> > get merged
> > > with your local changes. Your file now contains changes from
> > > repository (content) plus it is marked for deletion. When
> > you commit,
> > > the file gets deleted.
> >
> > Wouldn't be reporting a conflict the right behavior? There
> > are conflicting changes on the quite every line of the file -
> > deleting the line (in the wc) and adding/changing it (from update).
> >
> > Stefan
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> > For additional commands, e-mail: users-help@subversion.tigris.org
> >
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 9 14:15:00 2007