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

Recovery from switch/update tree conflicts is too hard

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Duplicate
    • trunk
    • ---
    • libsvn_wc

    Description

      To resolve a tree conflict caused by an incoming deletion in update or switch,
      the user has to determine what local mods caused the tree conflict, stash them
      somewhere, re-run the update, and then redo the local mods (if they wish).
      
      We'd like 'svn resolve --accept mine-full' to handle this, but need an API to
      hide and restore arbitrary local mods.  
      
      For single-file tree conflicts, we could store 'MINE' in the adm area along with
      the existing text-base (and perhaps 'THEIRS', i.e., the update/switch target,
      too).  In other words,  provide a more general revert command.  
      
      For directory trees there is no corresponding revert command (it simply restarts
      the update).  There's (currently) no way to stash a directory tree in the admin
      area.
      

      Original issue reported by sbutler

      Attachments

        Issue Links

          Activity

            People

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

              Dates

                Created:
                Updated:
                Resolved: