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

Perforce diffs with binary changes cause an error when trying to add them to a review

    XMLWordPrintable

Details

    Description

      Trying to upload (in any way) a perforce patch (produced by running 'p4 -z tag diff -du') that has changes in binary files, produces an error: Error adding patch: Unrecognised diff format. Expected diff hunk descriptor but found: (... files differ ...)

      Sample patch:

      ... depotFile //depot/private/ProjectX/14
... clientFile /Users/lpater/test/p4/sample/checkout/private/ProjectX/14
... rev 2
... type text

@@ -1,4 +1,5 @@
 test
+test
 foobar
 foobar
 foobar
... depotFile //depot/private/ProjectX/doc.doc
... clientFile /Users/lpater/test/p4/sample/checkout/private/ProjectX/doc.doc
... rev 1
... type binary

(... files differ ...)
... depotFile //depot/private/ProjectX/kiwi.txt
... clientFile /Users/lpater/test/p4/sample/checkout/private/ProjectX/kiwi.txt
... rev 1
... type text

@@ -1,3 +1,8 @@
+test
+foobar
+foobar
+foobar
+foobar
 foobar
 foobar
 foobar

      Attachments

        Activity

          People

            lpater Lukasz Pater
            lpater Lukasz Pater
            Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: