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

Make every tree conflict victim have a WC entry.

    XMLWordPrintableJSON

    Details

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

      Description

      When a merge involves an incoming change that is to be applied to a node that
      doesn'e exist in the WC, the non-existent node is the tree conflict victim.
      Presently metadata is stored about it in the parent directory's WC entry. It
      would be much simpler w.r.t. "walking" the WC and various other internal tasks,
      if every tree conflict victim had an "entry".
      
      Thus, we should probably make each victim, including enversioned/non-existent
      ones, have an "entry".
      
      As a follow-on, perhaps the tree conflict metadata itself could then be stored
      in the victim's entry rather than in the parent dir's entry. That should
      simplify a lot of code too, especially with regard to several APIs and internal
      functions presently needing the adm_access of the target's parent.
      

        Attachments

          Issue Links

            Activity

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved: