From owner-freebsd-current@FreeBSD.ORG  Thu Dec 12 19:31:06 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 F357CEFD
 for <current@freebsd.org>; Thu, 12 Dec 2013 19:31:05 +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 C81A010B1
 for <current@freebsd.org>; Thu, 12 Dec 2013 19:31:05 +0000 (UTC)
Received: from Julian-MBP3.local (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 rBCJUtZS042695
 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO)
 for <current@freebsd.org>; Thu, 12 Dec 2013 11:30:58 -0800 (PST)
 (envelope-from julian@elischer.org)
Message-ID: <52AA0EE9.9060207@elischer.org>
Date: Fri, 13 Dec 2013 03:30:49 +0800
From: Julian Elischer <julian@elischer.org>
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: FreeBSD Current <current@freebsd.org>
Subject: P4 question. not really a freebsd  but using with freebsd
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
 <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 19:31:06 -0000

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).


Julian