Date: Sat, 23 Mar 2013 08:44:56 -0500 From: Diane Bruce <db@db.net> To: Ruslan Makhmatkhanov <cvs-src@yandex.ru> Cc: FreeBSD Ports Mailing List <ports@freebsd.org> Subject: Re: Fwd: Problem with svn properties on non-ascii file Message-ID: <20130323134456.GA42602@night.db.net> In-Reply-To: <514DACAE.5040401@yandex.ru> References: <514DAC37.2010909@yandex.ru> <514DACAE.5040401@yandex.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Mar 23, 2013 at 05:22:54PM +0400, Ruslan Makhmatkhanov wrote: > > > -------- Original message -------- > Subject: Problem with svn properties on non-ascii file > Date: Sat, 23 Mar 2013 17:20:55 +0400 > From: Ruslan Makhmatkhanov <cvs-src@yandex.ru> > To: FreeBSD Developers <developers@FreeBSD.ORG> > > Hi, > > I'm trying to commit update to deskutils/gourmet, that have this patch file: > https://github.com/thinkle/gourmet/commit/9ad4df6f1387df10d3bd79752cfb6fbf0c285fa4 > > I got this error both with using psvn and manually setting the > properties (svn propset svn:mime-type text/plain > patch-gourmet__defaults__defaults_ru.py): That mime-type is clearly wrong if it is a binary file http://svnbook.red-bean.com/en/1.7/svn.advanced.props.file-portability.html#svn.advanced.props.special.mime-type If you are using psvn it forces a mime type of text which is wrong in this case. ${SVN} -q propset svn:mime-type text/plain ${_file} You'll have to manually make sure this file has the right properties and commit with svn not psvn. > > """ > "svn-commit.3.tmp" 20L, 883C ???????????????? > Sending Makefile > Sending distinfo > Adding files > Adding files/patch-gourmet__defaults__defaults_ru.py > Sending pkg-descr > Sending pkg-plist > Transmitting file data .....svn: E165001: Commit failed (details follow): > svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output: > Path > "head/deskutils/gourmet/files/patch-gourmet__defaults__defaults_ru.py" > contains binary but has svn:mime-type "text/plain" > Try application/* (application/octet-stream) or image/* instead. > == Pre-commit problem count: 1 > > svn: E165001: Your commit message was left in a temporary file: > svn: E165001: '/home/rm/learn/free/004/deskutils/svn-commit.3.tmp' > """ > > I believe that the problem is because of utf-8 in patch file. So it's me > who should fix something, or there is a problem with the hook itself? > Thanks. > > -- > Regards, > Ruslan > > Tinderboxing kills... the drives. - Diane -- - db@FreeBSD.org db@db.net http://www.db.net/~db
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130323134456.GA42602>