mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-21 20:56:09 +02:00
Code

Remove $Id: ..$ $Header: ..$ etc from +ko and +k files during import 

This patch removes the '$Keyword: ...$' '...' data, so that files
don't have spurious megre conflicts between branches.

Handles both +ko and +k styles, and leaves the '$Foo$' in
the original file.

Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Jason McMullan 2007-12-05 12:16:56 -05:00 committed by Simon Hausmann
parent d8534adac7
commit f3e9512be1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/fast-import/git-p4
View File

@ -964,9 +964,13 @@ class P4Sync(Command):
stat = filedata[j]
j += 1
text = ''
while j < len(filedata) and filedata[j]['code'] in ('text',
'binary'):
text += filedata[j]['data']
while j < len(filedata) and filedata[j]['code'] in ('text', 'unicode', 'binary'):
tmp = filedata[j]['data']
if stat['type'] in ('text+ko', 'unicode+ko', 'binary+ko'):
tmp = re.sub(r'(?i)\$(Id|Header):[^$]*\$',r'$\1$', tmp)
elif stat['type'] in ('text+k', 'ktext', 'kxtext', 'unicode+k', 'binary+k'):
tmp = re.sub(r'(?i)\$(Id|Header|Author|Date|DateTime|Change|File|Revision):[^$]*\$',r'$\1$', tmp)
text += tmp
j += 1