зеркало из https://github.com/microsoft/git.git
Merge branch 'mt/p4-depotFile-at-version'
* mt/p4-depotFile-at-version: p4: retrieve the right revision of the file in UTF-16 codepath
This commit is contained in:
Коммит
8f436d1374
|
@ -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 ]
|
||||
|
|
Загрузка…
Ссылка в новой задаче