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

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

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Resolved
    • Priority: Major
    • Resolution: Duplicate
    • Affects Version/s: 1.10.0
    • Fix Version/s: None
    • Component/s: libsvn_client
    • Labels:
      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

            Activity

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved: