[gs-devel] Re: [gs-cvs] rev 7923 - in branches: . etc

[Till Kamppeter]

Looks like subversion recognizes this as an ID and messes it up. 
doc/gsdoc.el was never touched by the patches of the merger.

Probably all files which got explicitly listed as modified on the 
check-in of the new branch

    branches/gs-esp-gpl-merger/doc/gsdoc.el
    branches/gs-esp-gpl-merger/jbig2dec/configure.ac
    branches/gs-esp-gpl-merger/lib/jobseparator.ps
    branches/gs-esp-gpl-merger/src/md5.c
    branches/gs-esp-gpl-merger/src/md5.h
    branches/gs-esp-gpl-merger/toolbin/gen_ldf_jb2.py

need to be checked for messed $Id...$ expressions. How can one protect them?

    Till


SaGS wrote:
> ----- Original Message ----- From: <till at ghostscript.com>
> To: <gs-cvs at ghostscript.com>
> Sent: Wednesday, 09 May 2007 00:32
> Subject: [gs-cvs] rev 7923 - in branches: . 
> gs-esp-gpl-merger/docgs-esp-gpl-merger/jbig2dec 
> gs-esp-gpl-merger/libgs-esp-gpl-merger/src gs-esp-gpl-merger/toolbin
> 
> 
>> Author: till
>> Date: 2007-05-08 14:32:20 -0700 (Tue, 08 May 2007)
>> New Revision: 7923
>> ...
>>
>> Modified: branches/gs-esp-gpl-merger/doc/gsdoc.el
>> ===================================================================
>> --- trunk/gs/doc/gsdoc.el 2007-05-08 19:47:48 UTC (rev 7922)
>> +++ branches/gs-esp-gpl-merger/doc/gsdoc.el 2007-05-08 21:32:20 UTC 
>> (rev 7923)
>> @@ -522,14 +522,14 @@
>> ;; Replace the RCS $Id if one can be found in exactly the right 
>> format, and
>> ;; otherwise insert one just after the title, along with a warning 
>> message.
>>
>> -(if (re-search-forward "<!-- $Id: *\\([^ ]*\\) $ -->" nil t)
>> +(if (re-search-forward "<!-- $Id$ -->" nil t)
> 
> 
> This is incorrect. Please see bug #689093 "HTML [non-]conformance and 
> SVN keywords cleanup" 
> (http://bugs.ghostscript.com/show_bug.cgi?id=689093#c18 in particular).
> 
>>     (progn
>>       (setq Original (buffer-substring (match-beginning 1) (match-end 
>> 1)))
>>       (replace-match g~thisfile t t nil 1)
>>       )
>>     (progn
>>       (search-forward "</title>" nil t) (end-of-line)
>> -      (insert (concat "\n<!-- $Id: " g~thisfile " $ -->"))
>> +      (insert (concat "\n<!-- $Id$ -->"))
> 
> Idem.
> 
>>       (setq Original "(UNSET by gs-structure)")
>>       )
>>     )
>> ...
> 
> _______________________________________________
> gs-devel mailing list
> gs-devel at ghostscript.com
> http://www.ghostscript.com/mailman/listinfo/gs-devel
>