From owner-freebsd-current@FreeBSD.ORG  Fri Jul  5 08:46:53 2013
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@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 04DF7AD7
 for <current@freebsd.org>; Fri,  5 Jul 2013 08:46:53 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 by mx1.freebsd.org (Postfix) with ESMTP id 86FD31C15
 for <current@freebsd.org>; Fri,  5 Jul 2013 08:46:52 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.14.7/8.14.7) with ESMTP id r658ko4B071185;
 Fri, 5 Jul 2013 12:46:50 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.14.7/8.14.7/Submit) id r658knbt071184;
 Fri, 5 Jul 2013 12:46:49 +0400 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Fri, 5 Jul 2013 12:46:49 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Cy Schubert <Cy.Schubert@komquats.com>
Subject: Re: Ipfilter pre-Vendor Import Issue
Message-ID: <20130705084649.GC67810@FreeBSD.org>
References: <201307042210.r64MAEJb002949@slippy.cwsent.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <201307042210.r64MAEJb002949@slippy.cwsent.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: current@freebsd.org
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 08:46:53 -0000

  Cy,

On Thu, Jul 04, 2013 at 03:10:14PM -0700, Cy Schubert wrote:
C> Unfortunately it doesn't work any more. Here is what svn spit out at me.
C> 
C> slippy$ cd $MY_WORK_DIR/current/contrib/ipfilter
C> slippy$ svn merge --record-only file:///tank/wrepos/wsvn/base/vendor/ipfilte
C> r/dist@252548
C> svn: E205000: Try 'svn help merge' for more information
C> svn: E205000: Source and target must be different but related branches
C> svn: E205000: Source and target have no common ancestor: 
C> 'file:///tank/wrepos/wsvn/base/vendor/ipfilter/dist@252548' and 
C> '.@unspecified'
C> slippy$ 

AFAIU, the problem is that current contrib/ipfilter was never merged
from vendor/ipfilter. So, actually we are dealing with a first import
(from subversion viewpoint), not n-th.

What I'd prefer to see is the following:

- commit new ipfilter untouched to vendor-sys/ipfilter
- nuke sys/contrib/ipfilter
- svn copy vendor-sys/ipfilter to sys/netpfil/ipfilter

In future imports do:

- commit newer ipfilter to vendor-sys/ipfilter
- svn merge vendor-sys/ipfilter to sys/netpfil/ipfilter

What's the reason to keep code in contrib?

-- 
Totus tuus, Glebius.