Comment 6 for bug 325331

Dustin,

Thanks for the bug report. I've grabbed the git repo, imported it, briefly browsed the various branches and the output from git fast-export ...

  (prepare input file using git fast-export)
  (look at input file and see that COPYING added to the refs/remotes/origin/devel branch)
  mkdir ecryptfs-utils.bzr
  cd ecryptfs-utils.bzr
  bzr init-repo .
  bzr fast-import ../ecryptfs-utils.fi
  cd master
  bzr update
  (COPYING not there)
  bzr log --line | less
  (hmm - no mention of merges from devel)
  cd ../devel
  bzr update
  (COPYING there)
  bzr log COPYING
  (added in rev 2 and no changes since)

If you're running bzr.dev (or 1.12rc I think), "bzr log --line" on a branch concisely shows the history of each branch and puts [merge] after the date each time a merge occurred. To see the merged revisions, "bzr log --line -n0".

Can you please try that and let me know how sensible or otherwise the branch histories look? If bzr-fastimport is doing the wrong thing wrt interpreting the git-fast-export stream, I suspect it will stand out pretty obviously to you. We can then go back to the input file and see where I'm making the wrong assumption, e.g. I might be using the wrong basis somewhere when a new branch starts?