[p4] Integrate & RCS Keywords

[David Weintraub]

Perforce normally stores files in its depot with unexpanded keywords.
That way, you don't have this particular issue. Your best choice is to
go ahead and fix the RCS keywords on these files during the
integration in order to eliminate this headache once and for all.

The other way is to write your own script to compare the two files
sans RCS keywords and revert the ones which match (or even better,
mark them as "resolved"). You can use sed with this regex:

    sed s'/\(\$[A-Za-z][A-Za-z]*:\)[^$]*\$/\1/g'

and that will unexpand all the RCS keywords, so you can simply compare
the two files. However, this won't work for the evil "$Log$" keyword.

On 12/20/06, Kris Kumler <kris+perforce-user at kumler.us> wrote:
> I am attempting to do a reverse integration including files with RCS keywords.
> Many of the files scheduled only include differences with RCS
> keywords. e.g. $Id$ on one side and $Id: //depot/file...$ on the
> destination side.
>
> Is there a setting that can affect this and not schedule this files in
> the first place or a command (or script) that will allow me to revert
> those files without any changes.
> Going from an earlier time that this was done here, submitting this
> now and then on the next (forward) integration, we'll have to
> integrate all of these files again, without any real changes.
>
> Is there a compelling reason to accept the integrations as is?
>
> Thanks,
> Kris
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user
>


-- 
--
David Weintraub
qazwart at gmail.com