Merge branch 'mt/p4-depotFile-at-version'

* mt/p4-depotFile-at-version: p4: retrieve the right revision of the file in UTF-16 codepath
git-mirror · Jun 11, 2015 · 8f436d1 · 8f436d1
2 parents 829f03e + f5f53f1
commit 8f436d1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/git-p4.py b/git-p4.py
@@ -2145,7 +2145,7 @@ def streamOneP4File(self, file, contents):
             # them back too.  This is not needed to the cygwin windows version,
             # just the native "NT" type.
             #
-            text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']])
+            text = p4_read_pipe(['print', '-q', '-o', '-', "%s@%s" % (file['depotFile'], file['change']) ])
             if p4_version_string().find("/NT") >= 0:
                 text = text.replace("\r\n", "\n")
             contents = [ text ]