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

"resolve" should resolve a tree conflict victim, not the parent

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • trunk
    • 1.6.0
    • libsvn_wc

    Description

      "svn resolve" (and the APIs that implement it, down to
      resolve_conflict_on_entry() in libsvn_wc) marks as resolved any and all tree
      conflicts that are recorded in the specified target, when the target is a
      directory. Instead, the target to be resolved should be interpreted as a tree
      conflict victim, in line with our change to per-victim operations for all tree
      conflict handling.
      

      Attachments

        Activity

          People

            Unassigned Unassigned
            julianfoad Julian Foad
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: