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

tree conflict message ends a sentence with a colon

    XMLWordPrintableJSON

    Details

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

      1.11.0-dev (shortly after branching 1.10.x)

      HEAD is r1819713

      Description

      From https://svn.haxx.se/dev/archive-2017-12/0189.shtml (from me to dev@ on 2017-12-30 subject "Tree conflict 'svn merge' message"):

      {{
      Summary of conflicts:
      Tree conflicts: 1
      Searching tree conflict details for 'build/generator/util/executable.py' in repository:
      Checking r1819556... done
      Tree conflict on 'build/generator/util/executable.py':
      Changes destined for a file arrived via the following revisions during merge of
      '^/subversion/branches/swig-py3/build/generator/util/executable.py:1819163-1819564':

      No such file or directory was found in the merge target working copy.
      '^/subversion/trunk/build/generator/util/executable.py' was deleted in r1819556 by danielsh.

      Subversion is not smart enough to resolve this tree conflict automatically!
      See 'svn help resolve' for more information.

      Select: (p) Postpone, (r) Mark as resolved, (h) Help, (q) Quit resolution: h
      }}

      The phrase "for the following revisions …:" is not followed by anything; that's ungrammatical.

      Also, could the referent of "No such file or directory" be made clearer? Perhaps by indenting the whole thing a little so it's under the "Tree conflict on 'build/generator/util/executable.py':" headline.

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              danielsh Daniel Shahaf
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: