reconcile raises a KeyError on a fresh branch

There may be an interplay between 0.4 and 0.5 revision roundtripping going on or something. In the bzr branch that had been pushed into svn, the KeyErroring revid is a merged revision: 202.1.4

Does "bzr check" on that branch work ok ? (both locally and on the svn
url) ?
--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

Yes and yes.

Oh, and `bzr branch` not working fwiw:

> bzr branch spitfire.svn boom
    bzr: ERROR: bzrlib.errors.BzrCheckError: Internal check failed: Newly created pack file <bzrlib.repofmt.pack_repo.NewPack object at 0x1dd4990> has delta references to items not in its repository:
    {'texts': [('__init__.py-20080908123649-lz3vayx6gtzjffc0-6',
                '<email address hidden>'),
               ('setup.py-20080908123649-lz3vayx6gtzjffc0-5',
                '<email address hidden>')]}

    Traceback (most recent call last):
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/commands.py", line 921, in run_bzr_catch_errors
        return run_bzr(argv)
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/commands.py", line 866, in run_bzr
        ret = run(*run_argv)
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/commands.py", line 547, in run_argv_aliases
        return self.run(**all_cmd_args)
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/builtins.py", line 1102, in run
        source_branch=br_from)
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/bzrdir.py", line 1121, in sprout
        result_repo.fetch(source_repository, revision_id=revision_id)
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/repository.py", line 1120, in fetch
        find_ghosts=find_ghosts)
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/decorators.py", line 192, in write_locked
        result = unbound(self, *args, **kwargs)
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/repository.py", line 3010, in fetch
        return self._pack(self.source, self.target, revision_ids)
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/repository.py", line 3017, in _pack
        revision_ids).pack()
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/repofmt/pack_repo.py", line 721, in pack
        return self._create_pack_from_packs()
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/repofmt/pack_repo.py", line 891, in _create_pack_from_packs
        new_pack._check_references()
      File "/home/wouter/src/bzr/bzr.dev/bzrlib/repofmt/pack_repo.py", line 191, in _check_references
        % (self, pformat(missing_items)))
    BzrCheckError: Internal check failed: Newly created pack file <bzrlib.repofmt.pack_repo.NewPack object at 0x1dd4990> has delta references to items not in its repository:
    {'texts': [('__init__.py-20080908123649-lz3vayx6gtzjffc0-6',
                '<email address hidden>'),
               ('setup.py-20080908123649-lz3vayx6gtzjffc0-5',
                '<email address hidden>')]}

Which bzr-svn / bzr version ?

--
Jelmer Vernooij <email address hidden> - http://samba.org/~jelmer/
Jabber: <email address hidden>

Sorry, bzr.dev and lp:bzr-svn at <email address hidden> and <email address hidden>

This is a bug in reconcile dealing with text revisions that originate in ghost revisions. The attached patch fixes this.

This is triggered by the fact that bzr-svn uses VersionedFiles.add_lines() while in fact it should be using VersionedFiles.add_lines_with_ghosts(), since the left hand side parent may be missing (if merged in from a ghost). Bazaar is using that (missing) lhs text as delta parent and errors out when trying to retrieve it. As a workaround, you can just specify None for the text parents in add_lines(), and that will fix this bug but will also break storage of the text revision graph.

Bazaar needs to add VersionedFiles.add_lines_with_ghosts() and bzr-svn needs to start using it.

From what I can tell VersionedFiles.add_lines() should already allow ghosts, so closing the bzr-svn specific part of this bug.

So, can we milestone this bug on Bazaar then? Like I mentioned on the dup'd bug, this is severly effecting my work flow and making it so that Inkscape nightlies haven't been built for a month or so. Much less than nightly. :)

I'd like to second Ted's request. At the moment, bzr is almost unusable for the development of Mnemosyne, because of this bug.

I'm afraid I don't know enough about the VersionedFiles internals to fix this bug. Hopefully one of the other Bazaar developers can fix this.

VFS.add_lines supports ghosts always; bzr can't generate a delta if the LHS parent for a text isn't available.

On Fri, Mar 13, 2009 at 02:04:24AM -0000, Robert Collins wrote:
> VFS.add_lines supports ghosts always; bzr can't generate a delta if the
> LHS parent for a text isn't available.

Sooo, what's going on here then?

Wouter van Heyst

I don't know :P. I suggest running with BZR_PDB and investigating :)

Here's where I am, I've got people suggesting using Bazaar for Summer of Code. Is there any chance that it'll be usable by then?

http://www.nabble.com/Inkscape-DVCS---was%3A-Re%3A-GSoC-2009---Project-handling-in-the-repository-to22618014.html#a22817431

I believe that you can see a messed up repository by doing:

  bzr branch lp:~ted-gould/inkscape/trunk

On Wed, 2009-04-01 at 03:05 +0000, Ted Gould wrote:
> Here's where I am, I've got people suggesting using Bazaar for Summer of
> Code. Is there any chance that it'll be usable by then?

AFAIK I'm still waiting on a tarball of a problem repo to examine; I
thought jelmer was changing bzr-svn to use different interfaces which
could alter the behaviour of an import here too.

I agree that this is a pretty serious issue.

-Rob

No, as I've mentioned on IRC specifying only the parents that are
present raises an exception when the text is added again later *with*
all the parents.

Cheers,

Jelmer

On Wed, 2009-04-01 at 03:22 +0000, Robert Collins wrote:
> AFAIK I'm still waiting on a tarball of a problem repo to examine;

I can upload it, but it's 185M. Does pulling it from
lp:~ted-gould/inkscape/trunk not work?

On Wed, 2009-04-01 at 03:22 +0000, Robert Collins wrote:
> AFAIK I'm still waiting on a tarball of a problem repo to examine; I
> thought jelmer was changing bzr-svn to use different interfaces which
> could alter the behaviour of an import here too.

 http://people.ubuntu.com/~ted/inkscapetrunk.tar.gz

I think that this bug has all the information it needs. Could someone confirm that and perhaps talk about what the blockers are? It would be nice to get it fixed as it seems to be blocking a few projects from using Bazaar.

/me waves

I'm really running out of constructive things to say as comments on this bug...

Sorry this is taking so long. I just don't have the knowledge to deal with the pack internals. I hope to spend some time during the sprint (same time as UDS) to fix this together with somebody who does.

On Tue, 2009-05-12 at 16:00 +0000, Jelmer Vernooij wrote:
> Sorry this is taking so long. I just don't have the knowledge to deal
> with the pack internals. I hope to spend some time during the sprint
> (same time as UDS) to fix this together with somebody who does.

Great! I will be at UDS, so if there is any information or testing I
can provide please grab me! Thanks!

This is related to bug 373726

The reconcile bit of this bug is still open, but the other issues have been fixed in one of the recent versions of Bazaar.

I've submitted a fix for this to the list.

This is now fixed for me on the original branch I reported. Reverting bzr.dev to r4403, KeyError. r4404, succes!

Cheers to everyone who worked on it. (Jelmer, I'm going to buy you a beer or equivalent this evening)