mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* mt/p4-depotFile-at-version:
  p4: retrieve the right revision of the file in UTF-16 codepath
This commit is contained in:
Junio C Hamano
2015-06-11 09:29:55 -07:00
parent 829f03e98c f5f53f1410
commit 8f436d1374
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-p4.py
View File

@ -2145,7 +2145,7 @@ class P4Sync(Command, P4UserMap):
# them back too. This is not needed to the cygwin windows version, # them back too. This is not needed to the cygwin windows version,
# just the native "NT" type. # 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: if p4_version_string().find("/NT") >= 0:
text = text.replace("\r\n", "\n") text = text.replace("\r\n", "\n")
contents = [ text ] contents = [ text ]