From owner-freebsd-current@FreeBSD.ORG  Thu Dec 12 22:59:57 2013
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 55589E5
 for <current@freebsd.org>; Thu, 12 Dec 2013 22:59:57 +0000 (UTC)
Received: from ipmail06.adl6.internode.on.net (ipmail06.adl6.internode.on.net
 [IPv6:2001:44b8:8060:ff02:300:1:6:6])
 by mx1.freebsd.org (Postfix) with ESMTP id E046C11C9
 for <current@freebsd.org>; Thu, 12 Dec 2013 22:59:56 +0000 (UTC)
Received: from ppp121-45-108-103.lns20.adl6.internode.on.net (HELO
 leader.local) ([121.45.108.103])
 by ipmail06.adl6.internode.on.net with ESMTP; 13 Dec 2013 09:29:53 +1030
Message-ID: <52AA3FE6.8000104@ShaneWare.Biz>
Date: Fri, 13 Dec 2013 09:29:50 +1030
From: Shane Ambler <FreeBSD@ShaneWare.Biz>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:24.0) Gecko/20100101 Thunderbird/24.1.0
MIME-Version: 1.0
To: Julian Elischer <julian@elischer.org>, 
 FreeBSD Current <current@freebsd.org>
Subject: Re: P4 question. not really a freebsd  but using with freebsd
References: <52AA0EE9.9060207@elischer.org>
In-Reply-To: <52AA0EE9.9060207@elischer.org>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.17
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: Thu, 12 Dec 2013 22:59:57 -0000

On 13/12/2013 06:00, Julian Elischer wrote:
> so I have a freebsd tree checked into perforce.
>  one particular subdirectory has been heavily modified to teh extent
> that it's not really hte same thing any more and I want to move it out
> to a separate place, and then replace it with the original contents so I
> can update the tree and get changes to that original directory.
> 
> I can think of two ways to do this:
> # move the modified one out
> p4 open
> p4 move //depot/Freebsd/src1/sys/netatalk/...
> //depot/Freebsd/src1/sys/netmumble/...
> followed by:
> # bring back the original version by copying it from before changes
> started.
> p4 integrate //depot/Freebsd/src1/sys/netatalk/...@original_import
> //depot/Freebsd/src1/sys/netmumble/...
> p4 resolve
> p4 submit
> 
> 
> Or, a second alternative: not quite sure how to do this if there are
> deletions and additions on the tree
> #copy out the modified version.
> #revert the directory in question to exactly how it was before the
> changes started
> files in netmumble should see all their history even when they were in
> netatalk,
> and files now in netatalk should see history from before the changes
> started,
> and MAYBE from when they were modified  (optional).

Personally, using svn I would use the second approach

mv netatalk netmumble
rm -R netmumble/.svn
svn co netatalk
diff -ru netatalk netmumble

or cp then svn revert would give the same result.