From owner-freebsd-ports@FreeBSD.ORG Sat Mar 23 13:46:02 2013 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 3A77D9C6 for ; Sat, 23 Mar 2013 13:46:02 +0000 (UTC) (envelope-from db@db.net) Received: from diana.db.net (unknown [IPv6:2620:64:0:1:223:7dff:fea2:c8f2]) by mx1.freebsd.org (Postfix) with ESMTP id 27707685 for ; Sat, 23 Mar 2013 13:46:02 +0000 (UTC) Received: from night.db.net (localhost [127.0.0.1]) by diana.db.net (Postfix) with ESMTP id CEF612AA36F; Sat, 23 Mar 2013 07:45:59 -0600 (MDT) Received: by night.db.net (Postfix, from userid 1000) id 9B5A81CC14; Sat, 23 Mar 2013 08:44:56 -0500 (EST) Date: Sat, 23 Mar 2013 08:44:56 -0500 From: Diane Bruce To: Ruslan Makhmatkhanov Subject: Re: Fwd: Problem with svn properties on non-ascii file Message-ID: <20130323134456.GA42602@night.db.net> References: <514DAC37.2010909@yandex.ru> <514DACAE.5040401@yandex.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <514DACAE.5040401@yandex.ru> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: FreeBSD Ports Mailing List X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Mar 2013 13:46:02 -0000 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 > To: FreeBSD Developers > > 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