[p4] Integrating file-type changes automatically?

[steve@vance.com]

I made a request shortly after they added the '-t' option to integrate (in
2000.2) to at least make that functionality available through a branch spec
option. Add your name to that if that interests you.

Others have filed requests for resolvable deletes and adds. At one point I
put a fairly detailed proposal to the list with enough information on how
to accomplish it internally. There were some optimistic words by
high-ranking Perforce people a couple of user conferences ago towards
addressing it, but it seems to have fallen by the wayside. Again, add your
name to that request.

I can't answer why file type is not resolvable, except that it doesn't show
up in a diff. The default behavior of not propagating it seems wrong to me,
but there are some backwards compatibility issues at play here, also.

Steve

Original Message:
-----------------
From: Oren Shemesh (oshemesh) oshemesh at cisco.com
Date: 	Thu, 15 Nov 2007 20:00:35 +0100
To: brad.holt at autodesk.com, Julian.Foad at sepura.com,
perforce-user at perforce.com
Subject: Re: [p4] Integrating file-type changes automatically?


I would like to see them properly handle file addition and deletion in
integration (Such as the ability to do 'accept yours' on a branched file
in order NOT to add it and not be bothered by this again, or do 'accept
yours' on an integrated deletion in order not to delete the target file
and not be bothered by this again), for which they have a pending change
request for quite a few years...

The file type case is probably much simpler to solve, let's hope they do
it quicker - but someone has to officially ask for this first. If you
ask them, they will tell you whether such a change request exists, or
are you the first one to ask for it.

Oren.

-----Original Message-----
From: perforce-user-bounces at perforce.com
[mailto:perforce-user-bounces at perforce.com] On Behalf Of Brad Holt
Sent: Thursday, November 15, 2007 6:55 PM
To: Julian Foad; perforce-user at perforce.com
Subject: Re: [p4] Integrating file-type changes automatically?

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.

_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user

_______________________________________________
perforce-user mailing list  -  perforce-user at perforce.com
http://maillist.perforce.com/mailman/listinfo/perforce-user


--------------------------------------------------------------------
mail2web LIVE – Free email based on Microsoft® Exchange technology -
http://link.mail2web.com/LIVE