diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-11 18:29:55 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-11 18:29:55 +0200 |
| commit | 8f436d1374c7b8bd29118bd6344520dbaf83594b (patch) | |
| tree | 4b4714c43cd3a1374c0595fe89872b6a642ae909 /git-p4.py | |
| parent | Merge branch 'mh/verify-lock-error-report' (diff) | |
| parent | p4: retrieve the right revision of the file in UTF-16 codepath (diff) | |
| download | git-8f436d1374c7b8bd29118bd6344520dbaf83594b.tar.xz git-8f436d1374c7b8bd29118bd6344520dbaf83594b.zip | |
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-x | git-p4.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 ] |