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

Add option to resolve conflicts by selecting a specific file

    XMLWordPrintableJSON

    Details

    • Type: Improvement
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: all
    • Fix Version/s: 1.5.0
    • Component/s: libsvn_client
    • Labels:
      None

      Description

      This came up in a discussion on IRC and was then brought to the dev@ list. 
      Everyone seems to agree it would be a great idea.
      
      It started simple.  User wanted a command like this:
      
      svn resolved --accept=mine|yours|orig
      
      Perhaps shortcut to -a=m|y|o
      
      This seems fairly obvious, and is probably easy to code.  Basically it would
      resolve the conflict, and also set the WC file to the file specified in the option.
      
      Besides being a user-friendly feature, it would be great for scripting and also
      be useful for GUI tools so that they could have an API to do this.
      
      As the dicussion evolved, it also became clear that this same option could and
      should just be extended to the commands that create conflicts:
      
      merge
      update
      switch
      
      All of these should also support the --accept option.  Again, these options
      would likely best be used by people that are using automated scripts and if a
      conflict arises they know the version they prefer.
      

      http://subversion.tigris.org/servlets/BrowseList?list=dev&by=thread&from=583709

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              markphip Mark Phippard
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: