[PATCH] In perforce, RCS keywords are case-sensitive
- From
Daniel Barkalow <barkalow@iabervon.org>
- Date
- Jul 22, 2008, 16:48 UTC
- Message-ID
- <alpine.LNX.1.00.0807221235000.19665@iabervon.org>
At least, this is true in 2007.2, according to the documentation.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> ---
A line of perl with the variable $file in a string followed by a different variable not in the string, for example, doesn't get mangled by p4 and may therefore appear in a p4 depot.
I don't know if the "old-style keyword expansion" is case-sensitive, though, so I'm leaving that alone.
contrib/fast-import/git-p4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index d8de9f6..1ee612e 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -902,7 +902,7 @@ class P4Sync(Command): if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'): text = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', text) elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'): - text = re.sub(r'(?i)\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text) + text = re.sub(r'\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', text) contents[stat['depotFile']] = text
-- 1.5.6.rc2.26.g8c37.dirty