From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Haggerty Subject: Re: git-cvsimport - losing changes in subsequent pulls of a CVS branch that I thought I wasn't modifying in the GIT repo. Date: Wed, 20 Aug 2008 09:47:09 +0200 Message-ID: <48ABCBFD.7070503@alum.mit.edu> References: <48AA6F8E.70807@bluelane.com> <48ABB899.4090608@alum.mit.edu> <48ABC943.20508@bluelane.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Matthias Urlichs , Git Mailing List , Piet Delaney , Piet Delaney , Avinash Kaul , Aravind Srinivasan To: piet@bluelane.com X-From: git-owner@vger.kernel.org Wed Aug 20 09:48:22 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KViQX-0001J4-GX for gcvg-git-2@gmane.org; Wed, 20 Aug 2008 09:48:21 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752388AbYHTHrR (ORCPT ); Wed, 20 Aug 2008 03:47:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752445AbYHTHrR (ORCPT ); Wed, 20 Aug 2008 03:47:17 -0400 Received: from einhorn.in-berlin.de ([192.109.42.8]:43281 "EHLO einhorn.in-berlin.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752388AbYHTHrQ (ORCPT ); Wed, 20 Aug 2008 03:47:16 -0400 X-Envelope-From: mhagger@alum.mit.edu Received: from [192.168.100.152] (ssh.berlin.jpk.com [212.222.128.135]) (authenticated bits=0) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id m7K7l9wD014928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 20 Aug 2008 09:47:09 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.16) Gecko/20080724 Thunderbird/2.0.0.16 Mnenhy/0.7.5.666 In-Reply-To: <48ABC943.20508@bluelane.com> X-Enigmail-Version: 0.95.0 X-Scanned-By: MIMEDefang_at_IN-Berlin_e.V. on 192.109.42.8 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Pete/Piet Delaney wrote: > Michael Haggerty wrote: >> If this is a one-time conversion (i.e., you don't need to actively track >> a live CVS repository), then I suggest that you try cvs2svn/cvs2git [1]. > [...] > > How does your proposed cvs2git facility deal with importing on top > of branches that have been modified? cvs2svn/cvs2git does not support this (called "incremental imports"). It is quite hard to implement robustly. In fact, I claim that no tool handles incremental imports robustly, despite the fact that some claim to do so :-) Michael