From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Missing file in EMACS_22_BASE (GIT repo) Date: Fri, 05 Oct 2007 11:59:27 +0200 Message-ID: References: <87przvxc7h.fsf@rho.meyering.net> <87ejgbxawc.fsf@rho.meyering.net> <47056821.70608@gnu.org> <47057BC7.9060100@gnu.org> <47060512.40507@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: sea.gmane.org 1191578407 17666 80.91.229.12 (5 Oct 2007 10:00:07 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 5 Oct 2007 10:00:07 +0000 (UTC) Cc: Jim Meyering , Emacs Devel To: Jason Rumney Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Oct 05 12:00:03 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 1IdjyG-0005n7-2Q for ged-emacs-devel@m.gmane.org; Fri, 05 Oct 2007 11:59:48 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdjyB-0004C0-Ie for ged-emacs-devel@m.gmane.org; Fri, 05 Oct 2007 05:59:43 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Idjy8-0004Bv-VZ for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:59:41 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Idjy4-0004Bb-Fz for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:59:40 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Idjy4-0004BY-9D for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:59:36 -0400 Original-Received: from cantor.suse.de ([195.135.220.2] helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Idjxz-0001du-BW; Fri, 05 Oct 2007 05:59:31 -0400 Original-Received: from Relay2.suse.de (mail2.suse.de [195.135.221.8]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 07D0B122BD; Fri, 5 Oct 2007 11:59:29 +0200 (CEST) X-Yow: ..Hmmm...This thing is really VIBRATING! ..It's getting WARM, too! In-Reply-To: <47060512.40507@gnu.org> (Jason Rumney's message of "Fri\, 05 Oct 2007 10\:34\:10 +0100") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (gnu/linux) 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:80286 Archived-At: Jason Rumney writes: > 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. Th= e >> current situation cannot have been created without rewriting history. >> =20 > The creation date of that file is what tells that it didn't exist befor= e > then. That is only true for the trunk. On a branch, there is *always* an extra commit with the automatically generated commit message "file ... was initially added on branch ..." (optionally followed by the date of the merge when the file was first added on the trunk). > 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. The current situation cannot be created without directly manipulating the branch tag. >> Now try -rEMACS_22_BRANCHPOINT. The file magically appears before it >> was even created. >> =20 > The EMACS_22_BRANCHPOINT tag is supposed to be there as an aid to > automated merging. No. The tag is supposed to represent the branch point exactly. > The other branchpoint tags such as emacs-unicode-2-base also present > the same problem, The emacs-unicode-2-base tag is indeed a moving tag. > regardless of the fact that those branches contain a redundant > deletion and readdition of the file. They are not redundant, those revisions are a direct result by the use of proper CVS operation. Andreas. --=20 Andreas Schwab, SuSE Labs, schwab@suse.de SuSE Linux Products GmbH, Maxfeldstra=DFe 5, 90409 N=FCrnberg, Germany PGP key fingerprint =3D 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED= 5 "And now for something completely different."