Uploaded image for project: 'Crucible'
  1. Crucible
  2. CRUC-6728

P4 diff on recent versions of Perforce does not produce the unified diff header we expect, even with the correct flags

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Medium
    • 3.4.0, 3.3.2
    • None
    • None
    • None

    Description

      On 2013.1/685046, p4 diff -dcu produces a patch file with the header:

      ==== //depot/foo/f.txt#1 - /Users/tdavies/tmp/p4test/foo/f.txt ====
@@ -1,1 +1,2 @@

      But on 2013.3/784164, the same command line produces:

      --- //depot/foo/bar.ipr 2013-12-23 18:36:46.000000000 -0800
+++ /webdev/foo/bar.ipr 2013-12-23 18:36:46.000000000 -0800
@@ -204,7 +204,7 @@

      I am not sure exactly which version of Perforce introduced the change.

      Attachments

        Issue Links

          mentioned in

          Page Loading...

          Activity

            People

              tom@atlassian.com Tom Davies
              tom@atlassian.com Tom Davies
              Votes:
              1 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Time Tracking

                  Estimated:
                  Original Estimate - Not Specified
                  Not Specified
                  Remaining:
                  Remaining Estimate - Not Specified
                  Not Specified
                  Logged:
                  Time Spent - 10m
                  10m