[fastimport/MERGE] Train fixes

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

James Westby wrote:
| On Sun, 2008-03-09 at 23:03 +0100, Adeodato Simó wrote:
|> * James Westby [Sun, 09 Mar 2008 19:31:34 +0000]:
|>
|>> dato's bzr-fast-export can export almost 1000 revisions of bzr.dev
|>> before crashing,
|> Oh, ghosts (yes?). I have no idea what the fast-import stream format has
|> to say about them.
|>
|
| Traceback (most recent call last):
|   File "../bzr-fast-export/bzr-fast-export", line 293, in <module>
|     sys.exit(main())
|   File "../bzr-fast-export/bzr-fast-export", line 67, in main
|     emit_commit(revid, branch, options.git_branch)
|   File "../bzr-fast-export/bzr-fast-export", line 109, in emit_commit
|     r = branch.repository.get_revision(current)
|   File "<string>", line 4, in get_revision_read_locked
|   File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/knitrepo.py",
| line 196, in get_revision
|     return self.get_revision_reconcile(revision_id)
|   File "<string>", line 4, in get_revision_reconcile_read_locked
|   File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line
| 1082, in get_revision_reconcile
|     return self._get_revisions([revision_id])[0]
|   File "<string>", line 4, in _get_revisions_read_locked
|   File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line
| 1096, in _get_revisions
|     self.get_transaction())
|   File "/usr/lib/python2.5/site-packages/bzrlib/store/revision/knit.py",
| line 88, in get_revisions
|     texts = self._get_serialized_revisions(revision_ids, transaction)
|   File "/usr/lib/python2.5/site-packages/bzrlib/store/revision/knit.py",
| line 106, in _get_serialized_revisions
|     raise errors.NoSuchRevision(self, e.revision_id)
| bzrlib.errors.NoSuchRevision:
|
KnitPackRevisionStore(VersionedFileStore('file:///home/jw2328/devel/bzr/.bzr/repository/'))
has no revision ('john at arbash-meinel.com-20050711051006-2d11704675600e95',)
|
|
| I haven't debugged it at all yet, I wanted to get the import code
| to handle it all before trying to generate even more revisions.
|
| The revision in question is
|
| revno: 897
| revision-id:mbp at sourcefrog.net-20050711061318-80557a9f045b1f38
| parent: mbp at sourcefrog.net-20050711054708-45b39cb65e6561f8
| parent: john at arbash-meinel.com-20050711051006-2d11704675600e95
| committer: Martin Pool <mbp at sourcefrog.net>
| timestamp: Mon 2005-07-11 16:13:18 +1000
| message:
|   - merge john's revision-naming code
|
| Which has two parents, but shows no merged revisions, so does that
| confirm that it is ghosts?
|
| Should we approach Shawn about a possible extension of the stream
| format to record ghosts? Or should they be discarded in the export?
|
| Thanks,
|
| James

I can confirm it as a ghost if only because I know that revision.
(No, I don't memorize all revisions in bzr.dev, but that is one of the few known
ghosts which happens to ensure that all of our code supports ghosts because if
not, it breaks on that revision :)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH1YWgJdeBCYSNAAMRAoERAKC7j4RXJRT9n7TICdUgZ8/R6DzwtQCg1vfY
sPyEtiAvwYPKMR+y+ht3nWU=
=y3Io
-----END PGP SIGNATURE-----