Re: svn delete does not warn anymore in some cases

2014-02-04 Thread Stefan Sperling
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.

$ svn --version
svn, version 1.8.5 (r1542147)
   compiled Jan  2 2014, 00:27:30 on x86_64-unknown-openbsd5.4

Copyright (C) 2013 The Apache Software Foundation.
This software consists of contributions made by many people;
see the NOTICE file for more information.
Subversion is open source software, see http://subversion.apache.org/

The following repository access (RA) modules are available:

* ra_svn : Module for accessing a repository using the svn network protocol.
  - with Cyrus SASL authentication
  - handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
  - handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using serf.
  - using serf 1.3.2
  - handles 'http' scheme
  - handles 'https' scheme

$ svn rm epsilon
D epsilon
D epsilon/zeta
$ echo foo  epsilon
$ svn add epsilon
A epsilon
$ svn st
R   epsilon
$ svn rm epsilon
svn: E195006: Use --force to override this restriction (local modifications may 
be lost)
svn: E195006: '/tmp/svn-sandbox/trunk/epsilon' has local modifications -- 
commit or revert them first
$


Re: svn delete does not warn anymore in some cases

2014-02-04 Thread Philip Martin
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 Martin | Subversion Committer
WANdisco // *Non-Stop Data*


Re: svn delete does not warn anymore in some cases

2014-02-04 Thread Philip Martin
Florin Avram flo...@sync.ro writes:

 So, my question is: is this SVN 1.8 svn delete behavior intentional
 or it should behave like with SVN 1.7 ?!

It was a result of a deliberate change in r1442611 to allow the delete
of unmodified copies without force:

   svn cp iota iota2
   svn rm iota2

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*


Re: svn delete does not warn anymore in some cases

2014-02-04 Thread Florin Avram

On 04.02.2014 14:51, Philip Martin wrote:

Florin Avram flo...@sync.ro writes:


So, my question is: is this SVN 1.8 svn delete behavior intentional
or it should behave like with SVN 1.7 ?!

It was a result of a deliberate change in r1442611 to allow the delete
of unmodified copies without force:

svn cp iota iota2
svn rm iota2



I think this does not answer completely to my question. If this was a 
deliberate change to allow the delete of unmodified copies, should 
reported changes (missing warnings) be considered as a not desired 
side-effect of this change (and there should be open an issue to be 
solved), or this is the right svn delete behavior from now on (meaning 
it is correct to behave such, even if the items are not being copied)?