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

Use "skel" format for tree-conflicts field in WC entry

    XMLWordPrintableJSON

    Details

    • Type: Task
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.6.0
    • Component/s: libsvn_wc
    • Labels:

      Description

      Tree conflict info is currently encoded in one field in a WC entry, using a
      format that was designed specifically for it, and implemented in
      subversion/libsvn_wc/tree_conflicts.[ch]. There is nothing special about the
      info that needs this format, and it would be better to use an existing format
      rather than maintaining yet another format description, encoding and decoding
      routines, and tests.
      
      The "skel" format is believed to be suitable.
      
      If this isn't changed before it is first released (in v1.6) and then we change
      it later, we'll have to maintain the reading code for backwards compatibility
      which is a pity but not a disaster.
      
      See the email thread starting on 2008-11-21 with the subject "Re: svn commit:
      r34293 - branches/tc_url_rev/subversion/libsvn_wc", changing to "WC entry format
      for tree conflict data".
      

        Attachments

          Activity

            People

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

              Dates

              • Created:
                Updated:
                Resolved: