[p4] Integrating changes in file type

[Nick Barnes]

We want to integrate a branch which includes changes in file type
(from "text" to "binary").  The file type changes don't "take" during
the integration.  Is this a bug?  Are we doing something wrong?
Surely we don't have to do the type changes by hand?

Here is a trivial example (server P4D/FREEBSD/99.1/10314 (1999/03/31),
client P4/FREEBSD/99.1/9814 (1999/02/24)):

$ cat > test
test file
^D
$ p4 add test
//depot/test#1 - opened for add
$ p4 submit ...
Change 34633 created with 1 open file(s).
Submitting change 34633.
Locking 1 files ...
add //depot/test#1
Change 34633 submitted.
$ p4 files ...
//depot/test#1 - add change 34633 (text)
$ p4 integrate test test2
//depot/test2#1 - branch/sync from //depot/test#1
$ p4 submit ...
Change 34634 created with 1 open file(s).
Submitting change 34634.
Locking 1 files ...
branch //depot/test2#1
Change 34634 submitted.
$ p4 edit -t binary test2
//depot/test2#1 - opened for edit
$ p4 submit test2
Change 34635 created with 1 open file(s).
Submitting change 34635.
Locking 1 files ...
edit //depot/test2#2
Change 34635 submitted.
$ p4 files ...
//depot/test#1 - add change 34633 (text)
//depot/test2#2 - edit change 34635 (binary)
$ p4 integrate test2 test
//depot/test#1 - integrate from //depot/test2#2
$ p4 submit ...
Change 34636 created with 1 open file(s).
Submitting change 34636.
//client-host/depot/test - must resolve //depot/test2#2
Merges still pending -- use 'resolve' to merge files.
Submit failed -- fix problems above then use 'p4 submit -c 34636'.
$ p4 resolve
/home/client/depot/test - vs //depot/test2#2
Non-text file merge.
Accept (at/ay) Edit (et/ey) Skip (s) Help (?): at
This overrides your changes: confirm accept (y/n)? y
//client-host/depot/test - copy from //depot/test2
$ p4 submit -c 34636
Submitting change 34636.
Locking 1 files ...
integrate //depot/test#2
Change 34636 submitted.
$ p4 files ...
//depot/test#2 - integrate change 34636 (text)
//depot/test2#2 - edit change 34635 (binary)
$