[p4] Integrating file-type changes automatically?
Brad Holt
brad.holt at autodesk.com
Thu Nov 15 08:54:37 PST 2007
Sorry, I don't want to take the thread off of Julian's request, but this did beg the question... Why doesn't p4 consider the filetype change an integrateable event? Without this one can easily get into trouble by losing explicit filetype changes in a branch. Forcing the user to explicitly exercise the -t option is too haphazard as the user in a mass merge will not have this information. I can think of quite a few scenarios where having it on or off by default could be very dangerous. P4 usually has a good reason for what they do, but I haven't seen it in this case. Is there a pending change request someone knows about for this one.
Anyway, back to Julian's question which I would also be keen to hear an answer to...
-brad
-----Original Message-----
From: perforce-user-bounces at perforce.com [mailto:perforce-user-bounces at perforce.com] On Behalf Of Julian Foad
Sent: Thursday, November 15, 2007 8:27 AM
To: perforce-user at perforce.com
Subject: [p4] Integrating file-type changes automatically?
Anyone written a script to integrate file-type changes (especially adding or removing the "k" and "x" modifiers) during a normal integration?
For those who aren't familiar with the problem, it's that "integ"
ignores file type changes by default, and the only built-in alternative is the "integ -t" option which blindly copies the file-type information from the source file to the destination file regardless of whether it's been changed on either (or both).
Using this option manually is too prone to user error. Ideally, we wish these changes would be integrated just like file-content changes are, including conflict resolution. As a good-enough solution we are looking for something (a trigger script, probably) that at least handles the type having been changed on either the source or the destination but not both, and propagates it or not accordingly.
If no-one has written such a thing, is that because it's difficult or there's a better way?
Thanks.
--
Julian Foad
Senior Software Engineer
Sepura plc
100 Longwater Avenue
Green Park
Reading
Berkshire
RG2 6GP
T: +44 (0)1223 874662
F: +44 (0)118 9450116
www.sepura.com
_______________________________________________________________________
The information in this email is confidential. It is intended solely for the addressee. Access to this email by anyone else is unauthorised. If you are not the intended recipient, any disclosure, copying, or distribution is prohibited and may be unlawful. If you have received this email in error please delete it immediately and contact commercial at sepura.com.
Sepura plc. Registered Office: Radio House, St Andrew?s Road, Cambridge, CB4 1GR, England. Registered in England and Wales. Registration Number 4353801
_______________________________________________________________________
This e-mail has been scanned for all viruses by Star Internet.
The service is powered by MessageLabs.
More information about the perforce-user
mailing list