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

* mt/p4-depotFile-at-version:
p4: retrieve the right revision of the file in UTF-16 codepath

diff --git a/git-p4.py b/git-p4.py
index ca6bb95c573608f8477ed7f3388c5df1e63f8041..26ad4bcf77e36624e4261ae2dfd93ba637914b9d 100755 (executable)
--- 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 ]