git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felix Natter <fnatter@gmx.net>
To: git@vger.kernel.org
Subject: Export from bzr / Import to git results in a deleted file re-appearing
Date: Thu, 12 Jul 2012 20:00:17 +0200	[thread overview]
Message-ID: <87ehogrham.fsf@bitburger.home.felix> (raw)

hi,

I am trying to move freeplane's repository (GPL-project) from bzr to
git, but when I do this:

$ mkdir freeplane-git1
$ cd freeplane-git1
$ git init .
$ bzr fast-export --export-marks=../marks.bzr ../trunk/ | git fast-import --export-marks=../marks.git
$ git checkout

then there are no errors, but the resulting working index is broken:
 freeplane-git1/freeplane_plugin_formula/src/org/freeplane/plugin/formula
 contains SpreadSheetUtils.java which belongs to package
 'org.freeplane.plugin.spreadsheet' and which is no longer in the bzr
 trunk that I imported!

The freeplane repo is publically available, so you should easily be able
to reproduce this:
  bzr branch bzr://freeplane.bzr.sourceforge.net/bzrroot/freeplane/freeplane_program/trunk

I reported this as a possible bzr-fastimport bug, but didn't get a
response so far:
  https://bugs.launchpad.net/bzr-fastimport/+bug/1014291

Is there maybe a better way to convert a repo from bzr to git?
This seems to be the standard solution on the web.

I am using Bazaar (bzr) 2.5.0dev6, bzr-fastimport 0.13.0 and git 1.7.10.4.

Thanks and Best Regards!
-- 
Felix Natter

             reply	other threads:[~2012-07-12 18:05 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-12 18:00 Felix Natter [this message]
2012-07-12 21:01 ` Export from bzr / Import to git results in a deleted file re-appearing Jeff King
2012-07-13  9:04   ` Andreas Schwab
2012-07-13 13:02     ` Jeff King
2012-07-13 13:39       ` Andreas Schwab
2012-07-14 14:33         ` Felix Natter
2012-07-15 10:23         ` [PATCH] fast-import: catch deletion of non-existent file in input Jeff King
2012-07-15 18:11           ` Jonathan Nieder
2012-07-16  0:26             ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87ehogrham.fsf@bitburger.home.felix \
    --to=fnatter@gmx.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).