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

Summary of conflicts printed at end of up/sw/merge

    XMLWordPrintableJSON

Details

    Description

      There is now a summary of conflicts and skips printed after an up/sw/merge
      operation. However, there are minor problems with it:
      
        * The summary is printed at the end of processing each target, not at the end
      of the whole operation. This means that a summary can scroll out of the user's
      sight, defeating its purpose.
      
        * When "update" skips a whole target (as opposed to some node within the
      target), it does not issue an "end of update" notification, and the summary does
      not get printed. This is not a problem in itself because the entire output is
      known to be just one line so there is no need for a summary. But when the
      summary is not printed, its counters do not get reset. A summary printed on
      completion of some later target will include the skip counts from any
      immediately preceding targets that were skipped.
      
      The summary should be printed at the end of the whole operation. This would fix
      both of the problems.
      

      Attachments

        Activity

          People

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

            Dates

              Created:
              Updated:
              Resolved: