[SVN-571] svn update/merge: D+A should say R

• Type: Improvement
• Status: Open
• Priority: Trivial
• Resolution: Unresolved
• Affects Version/s: all
• Fix Version/s: unscheduled
• Component/s: libsvn_client

Environment

Windows 2000

• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 29/Nov/01 16:10
• Updated: 17/Aug/07 19:43

Description

Running 'svn update' produced a list that had the same file twice, once as 
deleted (D) and once as add (A). 

svn update subversion
[...]
D subversion/www/project_faq.html
A subversion/www/project_faq.html
[...]

Shouldn't the appropriate behavior be to mark the file as Updated (U) instead?

From a user standpoint, it does not matter what happened to the file between 
the 2 revisions, and how many times it was deleted / added.  The important 
thing is that in the end this file is not exactly the same as was it was 
before, even if the content of the file per se is identical.

I saw in the "SVN for CVS users" document that there was also an R option for 
Replace (= delete then re-add) but my vote would go to just use update, because 
it's not very clear to me what R brings to the table, and it's yet another 
option the end user has to remember what it means.

-- Guillaume

Here are the revisions that caused this behavior:

--------------------------------------------------------
Revision 513
kfogel
2001-11-26 21:49 GMT
73
Undo rename of project_faq.html, since the live link does not change. :-(

--------------------------------------------------------
Revision 512
kfogel
2001-11-26 21:44 GMT
474
....
* subversion/www/faq.html: Replaces project_faq.html, silly to keep
having this "project" prefix.  Point to new server_setup.html where
appropriate.
....

Original issue reported by boissier

Issue Links

• depends upon: SVN-898 Implement true renames
• is blocked by: SVN-898 Implement true renames
• is duplicated by: SVN-570 svn update: D+A = U