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

In tree conflict info, report left/right URL@REV of the incoming change

    XMLWordPrintableJSON

    Details

    • Type: Improvement
    • Status: Closed
    • Priority: Critical
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.6.0
    • Component/s: unknown
    • Labels:

      Description

      A tree conflict currently reports whether the incoming change was a delete or
      add or modify. To help the user resolve the conflict, it would be better to also
      store and report the merge-left source and merge-right source URL@REV for a
      merge, and something similar for an update/switch. This would avoid the user
      having to remember or try to find out this info.
      
      In some cases, e.g. update a mixed-revision WC, I suspect (but have not
      verified) that it may presently be impossible to determine what the previous
      base revision number was after trying an update that caused tree conflicts.
      

        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: