From owner-svn-ports-head@freebsd.org  Mon Mar 26 09:35:24 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CE36BF57C8B;
 Mon, 26 Mar 2018 09:35:24 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2610:1c1:1:6074::16:84])
 (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 7F3ED7460E;
 Mon, 26 Mar 2018 09:35:24 +0000 (UTC)
 (envelope-from danfe@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1033)
 id 5E1A62337; Mon, 26 Mar 2018 09:35:24 +0000 (UTC)
Date: Mon, 26 Mar 2018 09:35:24 +0000
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: "Timur I. Bakeyev" <timur@FreeBSD.org>
Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: Re: svn commit: r465493 - head/net
Message-ID: <20180326093524.GA7483@FreeBSD.org>
References: <201803250102.w2P12p6m086048@repo.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <201803250102.w2P12p6m086048@repo.freebsd.org>
User-Agent: Mutt/1.9.2 (2017-12-15)
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Mar 2018 09:35:25 -0000

On Sun, Mar 25, 2018 at 01:02:51AM +0000, Timur I. Bakeyev wrote:
> New Revision: 465493
> URL: https://svnweb.freebsd.org/changeset/ports/465493
> 
> Log:
>   Hook up samba48. Repocopy policy... has issues.

There are no issues with repocopy policy and/or procedure.  You should have
repocopied, made necessary changes, then commit.  Instead, you've committed
verbatim copy, which naturally and unsurprisingly had resulted in conflict.

./danfe