* [PATCH] In perforce, RCS keywords are case-sensitive
@ 2008-07-22 16:48 Daniel Barkalow
  2008-07-24  7:05 ` Simon Hausmann
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel Barkalow @ 2008-07-22 16:48 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano
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
^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH] In perforce, RCS keywords are case-sensitive
  2008-07-22 16:48 [PATCH] In perforce, RCS keywords are case-sensitive Daniel Barkalow
@ 2008-07-24  7:05 ` Simon Hausmann
  0 siblings, 0 replies; 2+ messages in thread
From: Simon Hausmann @ 2008-07-24  7:05 UTC (permalink / raw)
  To: Daniel Barkalow; +Cc: git, Junio C Hamano
On Tuesday 22 July 2008 18:48:57 Daniel Barkalow wrote:
> At least, this is true in 2007.2, according to the documentation.
>
> Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Acked-By: Simon Hausmann <simon@lst.de>
Thanks,
Simon
> 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
^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-07-24  7:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-22 16:48 [PATCH] In perforce, RCS keywords are case-sensitive Daniel Barkalow
2008-07-24  7:05 ` Simon Hausmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).