From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Schwab Subject: Re: Export from bzr / Import to git results in a deleted file re-appearing Date: Fri, 13 Jul 2012 15:39:50 +0200 Message-ID: References: <87ehogrham.fsf@bitburger.home.felix> <20120712210138.GA15283@sigill.intra.peff.net> <20120713130246.GB2553@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain Cc: Felix Natter , git@vger.kernel.org To: Jeff King X-From: git-owner@vger.kernel.org Fri Jul 13 15:40:07 2012 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Spg6B-0006nT-Nw for gcvg-git-2@plane.gmane.org; Fri, 13 Jul 2012 15:40:00 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422669Ab2GMNjy (ORCPT ); Fri, 13 Jul 2012 09:39:54 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:37617 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422666Ab2GMNjx (ORCPT ); Fri, 13 Jul 2012 09:39:53 -0400 Received: from frontend4.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3WYZsp2qQMz4KKCB; Fri, 13 Jul 2012 15:41:02 +0200 (CEST) Received: from igel.home (ppp-93-104-150-219.dynamic.mnet-online.de [93.104.150.219]) by mail.mnet-online.de (Postfix) with ESMTPA id 3WYZrR3vbNzbbjp; Fri, 13 Jul 2012 15:39:51 +0200 (CEST) Received: by igel.home (Postfix, from userid 501) id 1F427CA2A2; Fri, 13 Jul 2012 15:39:51 +0200 (CEST) X-Yow: .. I want a COLOR T.V. and a VIBRATING BED!!! In-Reply-To: <20120713130246.GB2553@sigill.intra.peff.net> (Jeff King's message of "Fri, 13 Jul 2012 09:02:47 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Jeff King writes: > On Fri, Jul 13, 2012 at 11:04:21AM +0200, Andreas Schwab wrote: > >> > If you run only the bzr half of your command and inspect the output, you >> > will see that the file in question is mentioned twice. Once in a commit >> > on "refs/heads/master" that renames into it from another file: >> > >> > R freeplane_plugin_spreadsheet/src/org/freeplane/plugin/spreadsheet/SpreadSheetUtils.java >> > freeplane_plugin_formula/src/org/freeplane/plugin/formula/SpreadSheetUtils.java >> >> That same revision also removes it, but is uses the original name for >> the deletion (the bzr revision actually renames the containing >> directory). That's probably what confuses git fast-import. >> [...] >> The output contains these lines: >> >> R a/b b/b >> D a/b >> >> Changing the second line to D b/b fixes the bug. > > Yeah, I agree that is problematic. But I do not think it is a > fast-import bug, but rather bogus output generated by bzr fast-export (I > am not clear from what you wrote above if you are considering it a bug > that fast-import is confused). It seems nonsensical to mention a file > both as a rename source and as deleted in the same revision, and > certainly I would not expect an importer to deduce a link between the > second line and b/b. IMHO fast-import should raise an error in this case, like it does when you switch the lines. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."