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: Thu, 04 Oct 2007 23:24:33 +0100 Message-ID: <47056821.70608@gnu.org> References: <87przvxc7h.fsf@rho.meyering.net> <87ejgbxawc.fsf@rho.meyering.net> 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 1191536701 8661 80.91.229.12 (4 Oct 2007 22:25:01 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Thu, 4 Oct 2007 22:25:01 +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 00:24:58 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 1IdZ7o-0008Si-HJ for ged-emacs-devel@m.gmane.org; Fri, 05 Oct 2007 00:24:56 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdZ7j-0000qY-U6 for ged-emacs-devel@m.gmane.org; Thu, 04 Oct 2007 18:24:51 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IdZ7g-0000qT-Fm for emacs-devel@gnu.org; Thu, 04 Oct 2007 18:24:48 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IdZ7d-0000qH-Ug for emacs-devel@gnu.org; Thu, 04 Oct 2007 18:24:47 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IdZ7d-0000qE-PW for emacs-devel@gnu.org; Thu, 04 Oct 2007 18:24:45 -0400 Original-Received: from outmail1.freedom2surf.net ([194.106.33.237]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IdZ7d-0003Lk-FY for emacs-devel@gnu.org; Thu, 04 Oct 2007 18:24:45 -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 B9E8952784; Thu, 4 Oct 2007 23:24:44 +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:80255 Archived-At: Andreas Schwab wrote: > Looking closer the situation is more complicated. The file was added to > the trunk on 2007-06-15, but the EMACS_22_BASE branch was cut on > 2007-04-27. There is no indication in the RCS file how the file was > added to the EMACS_22_BASE branch (unlike the emacs-unicode-2, > multi-tty, unicode-xft and lexbind branches, which have explicit > revisions for the merges). It looks like the history of the file has > been modified after the fact, and neither cvsps nor git-cvsimport can be > blamed here. > It was added to the branches by tagging, which is the proper way to do such things in CVS. It seems it was then deleted from the other branches and re-added, presumably for the benefit of other revision control systems with which CVS is synched that have different ideas about what a branch is.