summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-11 09:29:55 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-11 09:29:55 -0700
commit8f436d1374c7b8bd29118bd6344520dbaf83594b (patch)
tree4b4714c43cd3a1374c0595fe89872b6a642ae909 /git-p4.py
parent829f03e98c63a69b0f3b6e40e012da8a0fe25e2a (diff)
parentf5f53f141087e8ba663d650399e8683c1fc6700b (diff)
downloadgit-8f436d1374c7b8bd29118bd6344520dbaf83594b.tar.gz
Merge branch 'mt/p4-depotFile-at-version'
* mt/p4-depotFile-at-version: p4: retrieve the right revision of the file in UTF-16 codepath
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-p4.py b/git-p4.py
index ca6bb95c57..26ad4bcf77 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -2145,7 +2145,7 @@ class P4Sync(Command, P4UserMap):
# 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 ]