treated as binary by SmartSVN? svn:mime-type application/x-javascript

[jbritton_14]

I just updated a branch from changes in my trunk and a conflict arose with one of my javascript files in my branch, but unfortunately I can't resolve the conflict through SmartSVN because it believes the javascript file to be binary (svn:mime-type application/x-javascript).  I had to go back to my explorer window and resolve the conflict with TortoiseSVN which it happily did with no confusion.

Anyone have suggestions for how to address this problem or insight on what I'm doing wrong?  Thanks for any help.

Jason



------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/smartsvn/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/smartsvn/join
    (Yahoo! ID required)

<*> To change settings via email:
    mailto:smartsvn-digest@...
    mailto:smartsvn-fullfeatured@...

<*> To unsubscribe from this group, send an email to:
    smartsvn-unsubscribe@...

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/

[jbritton_14]

Maybe a different way to ask this question:  How does SmartSVN determine whether a file is a binary file or not?  And if it incorrectly thinks a file is binary when it is not (a javascript file (application/x-javascript) in my instance) how do I correct it to indicate that the file is indeed textual in nature and can be compared/resolved from conflict if need be?

Thanks for any assistance.  So far I'm pleased with SmartSVN after a week of using it in our development environment and the only thing right now keeping us from buying the whole team licenses is figuring out this issue.

Jason


--- In smartsvn@..., "jbritton_14" <jbritton_14@...> wrote:
>
>
> I just updated a branch from changes in my trunk and a conflict arose with one of my javascript files in my branch, but unfortunately I can't resolve the conflict through SmartSVN because it believes the javascript file to be binary (svn:mime-type application/x-javascript).  I had to go back to my explorer window and resolve the conflict with TortoiseSVN which it happily did with no confusion.
>
> Anyone have suggestions for how to address this problem or insight on what I'm doing wrong?  Thanks for any help.
>
> Jason
>




------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/smartsvn/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/smartsvn/join
    (Yahoo! ID required)

<*> To change settings via email:
    mailto:smartsvn-digest@...
    mailto:smartsvn-fullfeatured@...

<*> To unsubscribe from this group, send an email to:
    smartsvn-unsubscribe@...

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/

[syntevo Support-3]

> Maybe a different way to ask this question:  How does SmartSVN determine
> whether a file is a binary file or not?

Sorry for the late reply. If svn:mime-type is present, (Smart)SVN uses this
property to determine whether the file is binary. Basically, everything what
doesn't start with "text/" is considered as binary. "application/x-javascript"
resp. "application/javascript" is a special case which is currently not
handled by SmartSVN and AFAIK also not by SVN, as I understand from following
thread:

 http://svn.haxx.se/dev/archive-2008-09/0458.shtml

> And if it incorrectly thinks a file is binary when it is not (a javascript
> file (application/x-javascript) in my instance) how do I correct it to
> indicate that the file is indeed textual in nature and can be
> compared/resolved from conflict if need be?

An immediate work-around is to set svn:mime-type to the obsolete value
"text/javascript". We will probably support "application/x-javascript" for the
next SmartSVN 6.0.x build.

--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com
 




"jbritton_14" <jbritton_14@...> wrote:

> Maybe a different way to ask this question:  How does SmartSVN determine
> whether a file is a binary file or not?  And if it incorrectly thinks a file
> is binary when it is not (a javascript file (application/x-javascript) in my
> instance) how do I correct it to indicate that the file is indeed textual in
> nature and can be compared/resolved from conflict if need be?
>
> Thanks for any assistance.  So far I'm pleased with SmartSVN after a week of
> using it in our development environment and the only thing right now keeping
> us from buying the whole team licenses is figuring out this issue.
>
> Jason
>
>
> --- In smartsvn@..., "jbritton_14" <jbritton_14@...> wrote:
> >
> >
> > I just updated a branch from changes in my trunk and a conflict arose with one of my javascript files in my branch, but unfortunately I can't resolve the conflict through SmartSVN because it believes the javascript file to be binary (svn:mime-type application/x-javascript).  I had to go back to my explorer window and resolve the conflict with TortoiseSVN which it happily did with no confusion.
> >
> > Anyone have suggestions for how to address this problem or insight on what I'm doing wrong?  Thanks for any help.
> >
> > Jason
> >
>
>
>
>
> ------------------------------------
>
> Yahoo! Groups Links
>
>
>
>

------------------------------------

Yahoo! Groups Links

<*> To visit your group on the web, go to:
    http://groups.yahoo.com/group/smartsvn/

<*> Your email settings:
    Individual Email | Traditional

<*> To change settings online go to:
    http://groups.yahoo.com/group/smartsvn/join
    (Yahoo! ID required)

<*> To change settings via email:
    mailto:smartsvn-digest@...
    mailto:smartsvn-fullfeatured@...

<*> To unsubscribe from this group, send an email to:
    smartsvn-unsubscribe@...

<*> Your use of Yahoo! Groups is subject to:
    http://docs.yahoo.com/info/terms/