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

Stop doing conflict-producing operations on already conflicted files

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: all
    • Fix Version/s: 1.8.0
    • Component/s: libsvn_wc
    • Labels:
      None

      Description

      If a file has both merge conflicts and update conflicts:
      
      > svn stat
      ?      ptproj/www/index.html.merge-right.r68
      ?      ptproj/www/index.html.mine
      ?      ptproj/www/index.html.r63
      ?      ptproj/www/index.html.r64
      ?      ptproj/www/index.html.working
      ?      ptproj/www/index.html.merge-left.r56
      C      ptproj/www/index.html
      
      then "svn resolved ptproj/www/index.html" only cleans up the merge-related "r-files", not the update-
      related ones:
      
      > svn resolved
      Resolved conflicted state of 'ptproj/www/index.html'
      > svn stat
      ?      ptproj/www/index.html.mine
      ?      ptproj/www/index.html.r63
      ?      ptproj/www/index.html.r64
      M      ptproj/www/index.html
      

      Original issue reported by jackrepenning

        Attachments

          Activity

            People

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

              Dates

              • Created:
                Updated:
                Resolved: