From owner-svn-ports-branches@freebsd.org  Thu Nov 30 15:56:56 2017
Return-Path: <owner-svn-ports-branches@freebsd.org>
Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 59F81E5F585;
 Thu, 30 Nov 2017 15:56:56 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 3CCEA69F07;
 Thu, 30 Nov 2017 15:56:56 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1354)
 id 892A9B20B; Thu, 30 Nov 2017 15:56:55 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: ports-committers@freebsd.org
Cc: svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject: Re: svn commit: r455209 - branches/2017Q4/emulators/ppsspp-devel
References: <201711301548.vAUFmQ0u072053@repo.freebsd.org>
Date: Thu, 30 Nov 2017 16:56:50 +0100
In-Reply-To: <201711301548.vAUFmQ0u072053@repo.freebsd.org> (Jan Beich's
 message of "Thu, 30 Nov 2017 15:48:26 +0000 (UTC)")
Message-ID: <fu8v-zrnh-wny@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain
X-BeenThere: svn-ports-branches@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for all the branches of the ports tree
 <svn-ports-branches.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-branches/>
List-Post: <mailto:svn-ports-branches@freebsd.org>
List-Help: <mailto:svn-ports-branches-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-branches>, 
 <mailto:svn-ports-branches-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Nov 2017 15:56:56 -0000

Jan Beich <jbeich@FreeBSD.org> writes:

> Author: jbeich
> Date: Thu Nov 30 15:48:26 2017
> New Revision: 455209
> URL: https://svnweb.freebsd.org/changeset/ports/455209
>
> Log:
>   MFH: r455208
>   
>   emulators/ppsspp-devel: update to 1.5.2
>   
>   Changes:	http://ppsspp.org/#news
>   Changes:	https://github.com/hrydgard/ppsspp/compare/v1.5.1...v1.5.2
>   Approved by:	ports-secteam (swills, implicit for snapshots)

Subversion was too meta to allow the following

  $ svn mv emulators/ppsspp-devel emulators/ppsspp
  $ svn merge -c455208 \^/head/ .
  svn: E155023: Can't set properties on '/tmp/2017Q4/emulators/ppsspp-devel': invalid status for updating properties.