On 04.02.2014 14:06, Philip Martin wrote:
Stefan Sperling <s...@elego.de> writes:
On Tue, Feb 04, 2014 at 11:49:24AM +0200, Florin Avram wrote:
Hi,
I noticed that SVN 1.8.5 does not give warnings for some situations, when
using "svn delete" (previously, using SVN 1.7.x, it did):
1. have a file replaced with a directory in the working copy:
- svn delete file
- create new directory, with the same name as the file
- svn add file (the directory; item is reported as replaced)
- svn delete file - no warning.
But, if trying to delete an added file, it warns. Shouldn't be something
similar in this case, since replaced = deleted + added ?!
I cannot reproduce this. Can you please provide command sequences
and their output instead of a verbal description? Below is what I did.
It's file replaced by directory:
svnadmin create repo --compatible-version 1.7
svn import -mm repo/format file://`pwd`/repo/A/f
svn co file://`pwd`/repo wc
svn rm wc/A/f
svn mkdir wc/A/f
svn rm wc/A/f
with 1.8 the last rm succeeds, with 1.7 the last rm fails unless --force
is used:
svn: E195006: Use --force to override this restriction (local modifications may
be lost)
svn: E195006: '/tmp/wc/A/f' has local modifications -- commit or revert them
first
Some things still cause 1.8 to require force: setting properties on the
directory or children, adding file children.
Philip is right.
I have some tests that worked with SVN 1.7.x, but they fail because the
"svn delete" operation behaves differently with SVN 1.8.5 r1542147
compiled Nov 27 2013.
What I saw from our tests, as a general SVN 1.8 behavior regarding "svn
delete", is that it does not provide warnings (does not force you to use
"--force" option anymore) in the below cases (there might be other cases
I did not found):
- for "added" directories, or items "replaced" with directories, if the
directory has no properties set or has no content (other files, dirs
inside);
If there are items inside a deleted directory, the warning is not
related with the deleted directory, but with an item inside it (with SVN
1.7, it said that the directory has changes).
- for "missing" items (files or directories).
So, my question is: is this SVN 1.8 "svn delete" behavior intentional or
it should behave like with SVN 1.7 ?!
