Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-571

svn update/merge: D+A should say R

    XMLWordPrintableJSON

    Details

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

      Windows 2000

      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

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                subversion-importer Subversion Importer
              • Votes:
                0 Vote for this issue
                Watchers:
                0 Start watching this issue

                Dates

                • Created:
                  Updated: