From owner-freebsd-current@FreeBSD.ORG Fri Dec 13 01:41:36 2013 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E87C7CE2 for ; Fri, 13 Dec 2013 01:41:36 +0000 (UTC) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA48A1E3F for ; Fri, 13 Dec 2013 01:41:36 +0000 (UTC) Received: from jre-mbp.elischer.org (ppp121-45-246-96.lns20.per2.internode.on.net [121.45.246.96]) (authenticated bits=0) by vps1.elischer.org (8.14.7/8.14.7) with ESMTP id rBD1fPFf043538 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Thu, 12 Dec 2013 17:41:32 -0800 (PST) (envelope-from julian@freebsd.org) Message-ID: <52AA65BF.7020508@freebsd.org> Date: Fri, 13 Dec 2013 09:41:19 +0800 From: Julian Elischer User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Shane Ambler , Julian Elischer , FreeBSD Current Subject: Re: P4 question. not really a freebsd but using with freebsd References: <52AA0EE9.9060207@elischer.org> <52AA3FE6.8000104@ShaneWare.Biz> In-Reply-To: <52AA3FE6.8000104@ShaneWare.Biz> Content-Type: text/plain; charset=ISO-8859-1; format=flowed 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2013 01:41:37 -0000 On 12/13/13, 6:59 AM, Shane Ambler wrote: > 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. > > unfortunately I have to use P4 :-/