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

AW: Bug in svn update?

From: Stefan Schulze <algroth_at_gmx.de>
Date: 2007-10-09 13:29:40 CEST

> 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
Received on Tue Oct 9 13:30:06 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.