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

filename info supplied to external diff3 tool

    XMLWordPrintableJSON

    Details

    • Type: New Feature
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: trunk
    • Fix Version/s: unscheduled
    • Component/s: cmdline client
    • Labels:
    • Environment:

      Linux

      Description

      There is a (brief) discussion of this feature request here: http://mail-
      archives.apache.org/mod_mbox/subversion-
      users/201103.mbox/%3C4D78198E.4040003@noaa.gov%3E
      
      In short: It would be helpful if svn could pass an extra command-line argument 
      to external diff tools specifying the name of the file being merged/updated.
      
      For example, I've modified my command-line-argument translation script (which 
      ultimately calls xxdiff) to print the arguments it receives from svn. Arguments 
      currently passed by example "svn update" and "svn merge" commands are shown 
      below, each prefixed by "-->":
      
      # svn up
      --> -E
      --> -m
      --> -L
      --> .mine
      --> -L
      --> .r124
      --> -L
      --> .r125
      --> /tmp/svn-tc4yxZ
      --> 
      /home/pmadden/Desktop/subversion/bin/124.up/.svn/pristine/52/52b97add73b43636edc
      ff8cf91e8f34b62fdf0ed
      --> 
      /home/pmadden/Desktop/subversion/bin/124.up/.svn/pristine/a2/a2130db254bdf801ee3
      fdba7ab548a9ce5e6ffb7
      
      # svn merge -r124:HEAD .
      --> -E
      --> -m
      --> -L
      --> .working
      --> -L
      --> .merge-left.r124
      --> -L
      --> .merge-right.r133
      --> /tmp/svn-Kd8veB
      --> /home/pmadden/Desktop/subversion/bin/124.up/svn-gsWOZO
      --> /home/pmadden/Desktop/subversion/bin/124.up/svn-DfS2Yk
      
      The name of the file in both cases is "allreduce.c", but that information isn't 
      available to pass to the external diff tool for display. It would be great to 
      have either an additional command-line option specifying the original filename, 
      or alternatively a tmpfile naming convention allowing simple, reliable 
      extraction of the original filename.
      
      I did this test using a build of the svn trunk:
      
      # svn --version
      svn, version 1.7.0 (dev build)
         compiled Mar 12 2011, 18:44:40
      
      I'm running Ubuntu Linux 10.04. I can provide other details if they're needed, 
      but I think the current behavior is correct and well-known, and this is just a 
      feature request.
      

      Original issue reported by p_madden

        Attachments

        1. 1_svn176_merge_fileinfo.patch
          1 kB
          Klaus Welch
        2. 2_svn176_merge_fileinfo.patch
          2 kB
          Klaus Welch

          Activity

            People

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

              Dates

              • Created:
                Updated: