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

RE: AW: Bug in svn update?

From: Brian Erickson <erickson_at_BAUERCONTROLS.com>
Date: 2007-10-09 14:12:10 CEST

Since the ultimate goal is to delete the file, why would an update need
to do anything?

Even so, having an unchanged file change from 'marked for deletion' to
'unversioned' seems like a good opportunity for improvement.

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
Received on Tue Oct 9 14:12:29 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.