From owner-p4-projects@FreeBSD.ORG Tue Oct 10 01:38:50 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9562716A47B; Tue, 10 Oct 2006 01:38:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BF3616A416; Tue, 10 Oct 2006 01:38:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.FreeBSD.org (Postfix) with ESMTP id 68FB643D4C; Tue, 10 Oct 2006 01:38:49 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from zion.baldwin.cx (zion.baldwin.cx [192.168.0.7]) (authenticated bits=0) by server.baldwin.cx (8.13.6/8.13.6) with ESMTP id k9A1cjDN082407; Mon, 9 Oct 2006 21:38:47 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: John Birrell Date: Mon, 9 Oct 2006 21:37:38 -0400 User-Agent: KMail/1.9.1 References: <200610091034.k99AYtcC064485@repoman.freebsd.org> In-Reply-To: <200610091034.k99AYtcC064485@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200610092137.39154.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [192.168.0.1]); Mon, 09 Oct 2006 21:38:47 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/2016/Mon Oct 9 12:58:54 2006 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 107544 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Oct 2006 01:38:50 -0000 On Monday 09 October 2006 06:34, John Birrell wrote: > http://perforce.freebsd.org/chv.cgi?CH=107544 > > Change 107544 by jb@jb_freebsd7 on 2006/10/09 10:21:52 > > This submit is the result of an integrate -ifb from current because it > appears that p4 gets confused by integrating files from different branches > which share the same file names. It can't or won't detect changes in the > content of the files because of it's secret dea of what a revision is. Read the docs. :) When you do p4 integ -i, it assumes that your version of the file is the master copy, so it leaves your version unchanged when a file is added on the parent but already exists on the child branch and you do p4 integ -i. Note that because CVS commits are just submitted as new submits to //depot/vendor, p4 has no way to know that the import it gets from a CVS commit is really adding the same file that was added over in a p4 branch. If HEAD were actually in p4 and and the original commit had been done via a reverse integrate up into HEAD from the sun4v branch, p4 would be able to DTRT. However, since HEAD is in CVS and we clone a copy into p4, p4 doesn't have any history to know that a new file in //depot/vendor/freebsd/... is really a commit of a file in a child branch. This is one reason why having the work trees and the actual HEAD in the same VCS would be helpful. -- John Baldwin