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:23:03 +0200 Message-ID: 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: quoted-printable X-Trace: sea.gmane.org 1191576216 10230 80.91.229.12 (5 Oct 2007 09:23:36 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 5 Oct 2007 09:23:36 +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 11:23:33 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 1IdjP5-0002q4-D6 for ged-emacs-devel@m.gmane.org; Fri, 05 Oct 2007 11:23:27 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdjP0-000633-IW for ged-emacs-devel@m.gmane.org; Fri, 05 Oct 2007 05:23:22 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IdjOw-00061y-Bf for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:23:18 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IdjOq-0005y9-4O for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:23:16 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdjOp-0005y1-Ve for emacs-devel@gnu.org; Fri, 05 Oct 2007 05:23:12 -0400 Original-Received: from ns.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 1IdjOm-0000GM-Dp; Fri, 05 Oct 2007 05:23:08 -0400 Original-Received: from Relay1.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 76A5F150D1; Fri, 5 Oct 2007 11:23:04 +0200 (CEST) X-Yow: My FAVORITE group is "QUESTION MARK & THE MYSTERIANS"... In-Reply-To: <47057BC7.9060100@gnu.org> (Jason Rumney's message of "Fri\, 05 Oct 2007 00\:48\:23 +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:80283 Archived-At: Jason Rumney writes: > Andreas Schwab wrote: >> This is done automatically by CVS when merging a new file from a >> different branch. This makes sure the file is marked dead before the >> merge. This revision is missing for the EMACS_22_BASE bran > I don't see why a file should be marked dead before it is even born. 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. > Commands such as "cvs update -rEMACS_22_BRANCH -D2007-06-14" > and "cvs update -rEMACS_22_1" still work as they should without > cluttering the repository with redundant versions of files. Now try -rEMACS_22_BRANCHPOINT. The file magically appears before it was even created. 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."