[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#727794: bzr-fastimport: failed on Obnam: gets renames in wrong order



Package: bzr-fastimport
Version: 0.13.0-2

I have used bzr for Obnam: the trunk branch is at
http://code.liw.fi/obnam/bzr/trunk/

I wanted to convert this to git, so I ran:

  bzr fast-export > ../trunk.fi

And then, in a new, empty git repo:

  mkdir obnam
  cd obnam
  git init
  git fast-import < ../trunk.fi

This failed:

  Initialized empty Git repository in /home/liw/obnam/x/.git/
  fatal: Path obnam/__init__.py not in branch
  fast-import: dumping crash report to .git/fast_import_crash_29810

After some debugging, I traced this to a commit that did, effectively,
this:

  mv obnam obnamlib
  mv cli.py obnam

The generated trunk.fi file tries to do the two operations in the
opposite order, resulting in a confused git fast-import. I worked
around this by manually editing trunk.fi and moving the "R ... cli.py
obnam" line _after_ all the lines that rename/delete obnam/* files.
After this, git fast-import was happy.

The bzr branch above is still available, and the problem is fully
reproducible.

-- 
http://www.cafepress.com/trunktees -- geeky funny T-shirts
http://gtdfh.branchable.com/ -- GTD for hackers


Reply to: