SVN conflict merging for .class files uses "binary"

Hi,

I'm really enjoying PHPStorm so far. Just have one issue:

We use .class files for PHP classes. When updating from SVN, .class files that have conflicts are not able to merge/edit conflicts. PHPStorm thinks these files are binary - I assume based on Java .class files. Is there any way to specify .class files as regular PHP so that merging will work? Right now, I only have options to "Accept theirs" or "Accept mine".

Thanks in advance,

Tim

8 comments
Comment actions Permalink

Does Settings|File types have *.class assigned to PHP?

0
Comment actions Permalink

Thanks for the response.

Yes, Settings | File Types has *.class under PHP, and they are recognized as PHP files everywhere else in the IDE except for the SVN merging.

0
Comment actions Permalink

Oh, I see. Looks looks this is merge-specific bug. Please file the bug report to http://youtrack.jetbrains.net/issues/WI an'd we'll look into it shortly.

0
Comment actions Permalink

Hi, Tim.

I could not reproduce the issue. Is it possible that your class files have "binary" property set on svn server? What
> svn propget svn:mime-type svn://url-to-a-file
command says in a system console?

Thanks,
Alexander.

1
Comment actions Permalink

Hi Alexander,

That was indeed the problem - some of the .class files had svn:mime-type property set to application/octet-stream.

Thanks a lot for your help.

Tim


1
Comment actions Permalink

Just as an aside - if it is not too much of an undertaking, it would be useful to still have the option to do a merge even if the file has a binary mime-type.

For example, TortoiseSVN and Eclipse (Subversive) have not had any issue merging such files.

Cheers

0
Comment actions Permalink

Ticked changed to corresponding feature request.

0

Please sign in to leave a comment.