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

API: describe four-way conflicts losslessly

    Details

    • Type: Improvement
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: trunk
    • Fix Version/s: 1.10-consider
    • Component/s: libsvn_wc
    • Labels:

      Description

      The function generate_propconflict() lossily converts a four-way conflict into a
      three-way representation: the 4->3 mapping depends on the values of the 4 sides,
      but it shouldn't.  See attached thread for details.
      
      Two changes should be made:
      
      1) the 4->3 mapping should be divorced from the values of the 4 sides.  See
      r1595522 for the 4->3 mapping property conflicts now use.  (The property mapping
      converts NULL to "" for stringification into the prej file; but in
      svn_wc_conflict_description3_t, we should be able to keep NULLs as NULLs.)
      
      2) svn_wc_conflict_description3_t should grow an additional file slot, in order
      for API users to have access to all four sides of the conflict, not just three.
      

      http://mail-archives.apache.org/mod_mbox/subversion-dev/201405.mbox/%3c20140517182437.GA3471@tarsus.local2%3e

        Attachments

        1. 1_prop3api.diff
          5 kB
          Daniel Shahaf (äñ§€¥£¢)

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              danielsh Daniel Shahaf (äñ§€¥£¢)
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated: