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

config:helpers:diff-cmd can break shelve in 1.10

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Resolved
    • Major
    • Resolution: Duplicate
    • 1.10.0
    • None
    • libsvn_client
    • None

    Description

      As reported on users:
      https://lists.apache.org/thread.html/7be202c6d0477f885ec396bef4fb13ebbc2382e15e727c55929281dc@%3Cusers.subversion.apache.org%3E
      when diff-cmd is configured to invoke some sort of GUI diff then shelve fails.

      For 1.10 the shelve code needs to ensure the internal diff code is invoked.

      This is a 1.10 only bug, in 1.11 shelve implements its own diff.

      Attachments

        Issue Links

          is duplicated by

          Bug - A problem which impairs or prevents the functions of the product. SVN-4758 Shelving 1.10: Unable to shelve changes when using custom diff-cmd

          • Major - Major loss of function.
          • Reopened

          Activity

            People

              Unassigned Unassigned
              philipm Philip Martin
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: