From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff King Subject: Re: Export from bzr / Import to git results in a deleted file re-appearing Date: Fri, 13 Jul 2012 09:02:47 -0400 Message-ID: <20120713130246.GB2553@sigill.intra.peff.net> References: <87ehogrham.fsf@bitburger.home.felix> <20120712210138.GA15283@sigill.intra.peff.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Cc: Felix Natter , git@vger.kernel.org To: Andreas Schwab X-From: git-owner@vger.kernel.org Fri Jul 13 15:03:00 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 1SpfWJ-0007nV-6o for gcvg-git-2@plane.gmane.org; Fri, 13 Jul 2012 15:02:55 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162617Ab2GMNCt (ORCPT ); Fri, 13 Jul 2012 09:02:49 -0400 Received: from 99-108-225-23.lightspeed.iplsin.sbcglobal.net ([99.108.225.23]:58810 "EHLO peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162577Ab2GMNCt (ORCPT ); Fri, 13 Jul 2012 09:02:49 -0400 Received: (qmail 2012 invoked by uid 107); 13 Jul 2012 13:02:48 -0000 Received: from sigill.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.7) (smtp-auth username relayok, mechanism cram-md5) by peff.net (qpsmtpd/0.84) with ESMTPA; Fri, 13 Jul 2012 09:02:48 -0400 Received: by sigill.intra.peff.net (sSMTP sendmail emulation); Fri, 13 Jul 2012 09:02:47 -0400 Content-Disposition: inline In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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. -Peff