From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: Missing file in EMACS_22_BASE (GIT repo) Date: Fri, 05 Oct 2007 10:34:10 +0100 Message-ID: <47060512.40507@gnu.org> References: <87przvxc7h.fsf@rho.meyering.net> <87ejgbxawc.fsf@rho.meyering.net> <47056821.70608@gnu.org> <47057BC7.9060100@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1191576879 12609 80.91.229.12 (5 Oct 2007 09:34:39 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 5 Oct 2007 09:34:39 +0000 (UTC) Cc: Jim Meyering , Emacs Devel To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 05 11:34:36 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IdjZl-0006VC-It for ged-emacs-devel@m.gmane.org; Fri, 05 Oct 2007 11:34:29 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdjZg-0003zj-UX for ged-emacs-devel@m.gmane.org; Fri, 05 Oct 2007 05:34:24 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IdjZd-0003xA-6s for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:34:21 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IdjZc-0003w1-06 for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:34:20 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdjZb-0003vq-OH for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:34:19 -0400 Original-Received: from outmail1.freedom2surf.net ([194.106.33.237]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IdjZb-0003J5-9G for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:34:19 -0400 Original-Received: from [127.0.0.1] (i-83-67-23-108.freedom2surf.net [83.67.23.108]) by outmail1.freedom2surf.net (Postfix) with ESMTP id 23ABA50111; Fri, 5 Oct 2007 10:34:13 +0100 (BST) User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) In-Reply-To: X-Detected-Kernel: Linux 2.4-2.6 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:80285 Archived-At: Andreas Schwab wrote: > It isn't. The file exists, but only on one branch. When it is added to > a different branch there needs to be a way to tell that the file didn't > exist before that point on that branch. That's the way CVS works. The > current situation cannot have been created without rewriting history. > The creation date of that file is what tells that it didn't exist before then. This is no different on a branch than the trunk. I think you are thinking of the way git or arch works, not the way CVS works. In CVS, files branch, not repositories. > Now try -rEMACS_22_BRANCHPOINT. The file magically appears before it > was even created. > The EMACS_22_BRANCHPOINT tag is supposed to be there as an aid to automated merging. It is not intended to give a snapshot of the development tree at a specific time. If it is supposed to do the latter, then it should be removed from that file, since the file did not exist at that time. The other branchpoint tags such as emacs-unicode-2-base also present the same problem, regardless of the fact that those branches contain a redundant deletion and readdition of the file.