[p4] Merge down, copy up with text+k files

[Peter Steiner]

Those with many text+k files (keyword expansion enabled files) in the  
repository might be interested in two scripts to support the Merge- 
down-copy-up idiom. The recipe in Laura Wingerds talk (http:// 
www.perforce.com/perforce/conferences/eu/2006/presentations/ 
laura_wingerd/ConvergenceVsDivergence.html) does not work for text+k  
files because p4 diff doesn't ignore differences in $keywords$.

I have written up a short entry in my blog (http://pesche.schlau.ch/ 
2007/07/03/merge-down-copy-up/) and put the scripts into the Perforce  
Public Depot under //guest/peter_steiner/merge-down-copy-up/...

Regards, Peter
--
Peter Steiner <peter.steiner at acm.org>
http://pesche.schlau.ch/                PGP-ID 0x02850F53 (DH/DSS)
PGP Fingerprint 68AB D08E D995 41B4 C6FD  639D 9B94 D249 0285 0F53