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

tree conflict info can be changed by update

VotersWatch issueWatchersLinkCloneUpdate Comment AuthorReplace String in CommentUpdate Comment VisibilityDelete Comments
    XMLWordPrintableJSON

    Details

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

      Description

      The attached recipe shows that information recorded about a tree conflict can be
      changed by subsequent updates.
      
      Relevant output from the script:
      
      + svn info update-move/trunk/epsilon
      + egrep ^(Tree Conflict|  Source)
        Source  left: (dir) ^/trunk/epsilon@1
        Source right: (dir) ^/trunk/epsilon@2
      + svn up --accept p update-move/trunk
      Updating 'update-move/trunk':
         C update-move/trunk/epsilon
         U update-move/trunk/epsilon/zeta
      Updated to revision 2.
      Summary of conflicts:
        Tree conflicts: 1
      + svn info update-move/trunk/epsilon
      + egrep ^(Tree Conflict|  Source)
        Source  left: (dir) ^/trunk/epsilon@2
        Source right: (dir) ^/trunk/epsilon@2
      
      This should not be allowed to happen because information about the operation
      which introduced the conflict is overwritten.
      

        Attachments

        1. 1_issue4347.sh
          0.7 kB
          Stefan Sperling

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              stsp Stefan Sperling

              Dates

              • Created:
                Updated:
                Resolved:

                Issue deployment