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

conflict resolver needs more useful "diff" option

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: trunk
    • Fix Version/s: 1.6.0
    • Component/s: cmdline client
    • Labels:
      None

      Description

      If you get conflicts during an update (let's ignore "merge" for the moment), the
      conflict resolver gives you a (d)iff option.  This diff is between the
      pre-update "base" file and the merged-with-conflict markers file.  If the update
      managed to merge lots of stuff in cleanly but conflicted on a few small parts,
      this will show an enormous diff where only a few parts are even in conflict. 
      While this might be useful in some cases, we at least should consider the option
      of, eg, the diff between the file you'd get if you chose all of the left choices
      and the file you'd get if you chose all of the right choices.
      

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              glasser David Samuel Glasser
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: