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

Support for external diff commands for non-text types

    Details

    • Type: Improvement
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: all
    • Fix Version/s: unscheduled
    • Component/s: cmdline client
    • Labels:
      None

      Description

      It would be really nice if we could have some sort of mechanism that allows Subversion to do diff and diff3 
      (using external commands probably) on non-text types (i.e. types not marked as "text/*"). Furthermore, it 
      would be very useful if this could also be done in an automated fashion (think of files with MIME-type 
      "application/xml", we would always want to use some external diff command which has knowledge about 
      the semantics/syntax of xml).
      
      Possible resolution: allow the user to specify certain diff commands for certain "binary" formats in its 
      config file. This would require that the hard-coded restriction in Subversion (only performing diffs/merges 
      on "text/*") be removed.
      
      See also the recent discussion on the dev-list from November 2005.
      

      Original issue reported by tieleman

        Issue Links

          Activity

          Hide
          kfogel Karl Fogel added a comment -

          *** Issue 1202 has been marked as a duplicate of this issue. ***
          

          Show
          kfogel Karl Fogel added a comment - *** Issue 1202 has been marked as a duplicate of this issue. ***
          Hide
          julianfoad Julian Foad added a comment -

          These mail threads are relevant:
          
            2005-07-11 "--diff3-cmd for binary files"
            <http://svn.haxx.se/dev/archive-2005-07/0408.shtml>
          
            2005-11-11 "Subversion conflict resolution"
            <http://svn.haxx.se/dev/archive-2005-11/0669.shtml>
          
          Issue #2044: "Fully customizable external diff invocations", about passing
          arguments to external diff, is closely related.
          
          

          Show
          julianfoad Julian Foad added a comment - These mail threads are relevant: 2005-07-11 "--diff3-cmd for binary files" <http://svn.haxx.se/dev/archive-2005-07/0408.shtml> 2005-11-11 "Subversion conflict resolution" <http://svn.haxx.se/dev/archive-2005-11/0669.shtml> Issue #2044: "Fully customizable external diff invocations", about passing arguments to external diff, is closely related.

            People

            • Assignee:
              Unassigned
              Reporter:
              subversion-importer Subversion Importer
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:

                Development