Re: Export from bzr / Import to git results in a deleted file re-appearing

2012-07-14 Thread Felix Natter
Andreas Schwab sch...@linux-m68k.org writes: Jeff King p...@peff.net 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

Re: Export from bzr / Import to git results in a deleted file re-appearing

2012-07-13 Thread Jeff King
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

Re: Export from bzr / Import to git results in a deleted file re-appearing

2012-07-13 Thread Andreas Schwab
Jeff King p...@peff.net 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

Export from bzr / Import to git results in a deleted file re-appearing

2012-07-12 Thread Felix Natter
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

Re: Export from bzr / Import to git results in a deleted file re-appearing

2012-07-12 Thread Jeff King
On Thu, Jul 12, 2012 at 08:00:17PM +0200, Felix Natter wrote: 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