On 14/09/11 19:29, Chris Li wrote:
On Wed, Sep 14, 2011 at 12:55 AM, Luke Diamand<luke@xxxxxxxxxxx> wrote:
On 13/09/11 22:33, Chris Li wrote:
The fix is simple, just ask perforce to print the depot
file into a real file. This way perforce will not performe
the utf16 to utf8 conversion. Git can import the exact same
file as perforce checkout.
Does this change do the right thing with RCS keywords in UTF16 files?
I don't know what is the rules about the RCS keyword in UTF16 files.
I look at the current git-p4, it does not do any keyword replacement in
utf16 files. So this patch did not change that. It should be a separate issue.
The way I see it, this patch is a straight enhancement compare to the
current git-p4 because the current git-p4 *corrupts* the utf16 files.
If p4CmdList() fails, e.g. due to running out of diskspace, will this just
happily import a truncated/corrupt file?
Good point. I add the error check and attach the new patch.
(And I could be wrong about this, but does you patch have newline damage? It
didn't seem to apply for me).
Looks good to me. I think you're right about the RCS keywords not being
relevant here.
Gmail dmage the white space. I should always use the attachment.
Does the attached patch work for you?
Thanks
Chris
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html