I dont know how mary jo would know to do this without you telling her, but there is a "propogate filetypes" checkbox in the "options" screen of the branching dialog window...

You could make it part of your branching procedure that you check this box at all times therefore picking up any filetype changes?

Ryan Gribble Software Quality Engineering TAB Queensland Limited Brisbane, Australia Phone: +617 3637 1431 gribble at tabq.com.au <mailto:gribble at tabq.com.au>

--__--__--

Message: 4 Date: Wed, 10 Jul 2002 11:59:32 -0700 From: Dennis Wheeler <dennis.wheeler at pictureiq.com> To: Perforce User <perforce-user at perforce.com> Subject: [p4] lost executable filetype change with integration

I seem to recall an issue with this in the past, but have been unable to find any information on it. Maybe it was a bug fix in the server or client, I don't recall

Can someone tell me how to prevent the problem in the future?

Here's the scenario - each of these step performed by various people most likely using differing client versions (some Windows, some Linux).

# add my wizbang new script to the project p4 add //depot/Main/script (text)

# integrate the latest changes from the mainline into the release branch p4 integ //depot/Main/... //depot/Branch/...

#oops forgot to set the executable bit p4 edit -t xtext //depot/Main/script (xtext)

# integrate the latest changes from the mainline into the release branch p4 integ //depot/Main/... //depot/Branch/...

problem: the change from text to xtext did not propagate into the branch

I see from 'p4 help integ' that using the '-t' flag will preserve the filetype change, but I don't see such an option in the Windows client, and how will Mary Jo know to use that flag to pick up Jim Bob's change when just trying to pick up all the lastest changes whatever they may be?

-- dennis

--__--__--

End of perforce-user Digest