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

Absence of warning

From: Dave Neary <dneary_at_free.fr>
Date: 2005-05-04 10:33:42 CEST


I was explaining to a colleague the logic behind a directory not
updating automatically when he committed a file removal, and came across
something which isn't really a bug, but which struck me as a little

I was expecting an out-of-date error when I tried to update to a
revision which deleted a file I had modified locally, but svn happily
updated, while leaving the locally modified file outside revision control.

Efforts to return to the old revision to see what changes I'd made or
other things like that did not succeed.

Would it be possible to have either a warning ("Warning: a locally
modified file has been deleted in a later revision"), an error ("svn:
Out of date: '/trunk/test/a'") or a conflict for such a change?

I know having an out-of-date error is not logical on an update, so
perhaps a way to have this be a conflict is the best. The problem being
that the change is made to the directory, and not to the file.

The steps to reproduce follow.


[dn_at_plrademe src]$ svn co svn://plrademe/svn/trunk/test test1
A test1/a
A test1/b
A test1/c
Checked out revision 784.
^[[A[dn_at_plrademe src]$ svn co svn://plrademe/svn/trunk/test test2
A test2/a
A test2/b
A test2/c
Checked out revision 784.
[dn@plrademe src]$ svn rm test1/a
D test1/a
[dn@plrademe src]$ svn ci -m "Remove a" test1/
Deleting test1/a

Committed revision 785.
[dn@plrademe src]$ vim test2/a
[dn@plrademe src]$ svn stat test2
M test2/a
[dn@plrademe src]$ svn up test2
D test2/a
Updated to revision 785.
[dn@plrademe src]$ svn stat test2
? test2/a
[dn@plrademe src]$ svn up -r 784 test2
svn: Failed to add file 'test2/a': object of the same name already exists

David Neary
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed May 4 11:10:05 2005

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.