From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: emacs.git mirror status Date: Fri, 14 Sep 2007 14:06:32 +0200 Message-ID: <86642dqwmv.fsf@lola.quinscape.zz> References: <87y7f9n06z.fsf@rho.meyering.net> <87sl5hmz2t.fsf@rho.meyering.net> <86zlzpr663.fsf@lola.quinscape.zz> <86r6l1qzp1.fsf@lola.quinscape.zz> <86ejh1qxie.fsf@lola.quinscape.zz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1189771615 29222 80.91.229.12 (14 Sep 2007 12:06:55 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 14 Sep 2007 12:06:55 +0000 (UTC) Cc: Jim Meyering , Emacs development discussions To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 14 14:06:52 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 1IW9wa-0007fI-6T for ged-emacs-devel@m.gmane.org; Fri, 14 Sep 2007 14:06:44 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IW9wZ-0001nE-Kd for ged-emacs-devel@m.gmane.org; Fri, 14 Sep 2007 08:06:43 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IW9wR-0001iV-S1 for emacs-devel@gnu.org; Fri, 14 Sep 2007 08:06:35 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IW9wR-0001hb-7O for emacs-devel@gnu.org; Fri, 14 Sep 2007 08:06:35 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IW9wR-0001hQ-0h for emacs-devel@gnu.org; Fri, 14 Sep 2007 08:06:35 -0400 Original-Received: from pc3.berlin.powerweb.de ([62.67.228.11]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IW9wQ-0003lJ-3b for emacs-devel@gnu.org; Fri, 14 Sep 2007 08:06:34 -0400 Original-Received: from quinscape.de (dslnet.212-29-44.ip210.dokom.de [212.29.44.210] (may be forged)) by pc3.berlin.powerweb.de (8.9.3p3/8.9.3) with ESMTP id OAA16626 for ; Fri, 14 Sep 2007 14:06:28 +0200 X-Delivered-To: Original-Received: (qmail 8630 invoked from network); 14 Sep 2007 12:06:32 -0000 Original-Received: from unknown (HELO lola.quinscape.zz) ([10.0.3.43]) (envelope-sender ) by ns.quinscape.de (qmail-ldap-1.03) with SMTP for ; 14 Sep 2007 12:06:32 -0000 Original-Received: by lola.quinscape.zz (Postfix, from userid 1001) id B843C8F8ED; Fri, 14 Sep 2007 14:06:32 +0200 (CEST) In-Reply-To: (Andreas Schwab's message of "Fri\, 14 Sep 2007 13\:53\:16 +0200") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1.50 (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:78867 Archived-At: Andreas Schwab writes: > David Kastrup writes: > >> For git, the sole difference between a merge and an import is that the >> former has the branch as a parent commit. All the other history is >> reconstructed by git on the fly rather than tracked. So just >> redeclaring the respective CVS checkins > > There are no such checkins. Huh? Miles never checked anything into CVS? > The history is located only in the various arch trees of Miles and > Karoly. I'm currently trying to see if I'm able to combine the cvs > and arch imports in any useful way. Again: all that needs to be done is to add the (then current) branch head of the branch to the parent of Miles' merging commits. git does not track any history apart from that. -- David Kastrup