can't merge

[Jeff Fortin Tam]

bzr branch http://bazaar.launchpad.net/~specto/specto/main
cd main
bzr merge http://bazaar.launchpad.net/~woutc/specto/specto-woutc

ERROR: Revision {('wout@wout-laptop-20071012201326-65ijzopxe5uj94tq',)} not present in "<bzrlib.knit.KnitGraphIndex object at 0x8c4abac>".

This happens whether I use simply "merge" or "merge -r0..-1"

[Matt Nordhoff (mnordhoff)]

This may be obvious to those more knowledgeable than myself, but...

The main branch is rich-root-pack. specto-woutc is dirstate. I can upgrade specto-woutc to pack-0.92 fine, but if I try to upgrade it to rich-root-pack I get the above error. Reconciling was done at every step. So it doesn't seem to have anything to do with merges.

bzr.dev r3283, Python 2.5.1, Ubuntu Gutsy (of course).

[Martin Pool (mbp)]

On 16/03/2008, James Westby <email address hidden> wrote:
> Hi all,
>
> Today I was trying to help nekohayo to debug a problem
> on IRC, and I'm stuck as to what is going on. I would
> appreciate someone helping with it, or giving some
> more pointers as to what to look for.

I think this is

  https://bugs.launchpad.net/bzr/+bug/202884

The traceback in that bug shows it failing inside generate_root_texts
while upgrading, while doing check_versions_present.

KnitGraphIndex needs a more useful repr, showing just what object it
was trying to look in. First off you should patch that and submit it
separately; it will help with this and similar bugs.

generate_r_i is trying to generate new inventories depending on the
particular root id, and it's failing to add that text because on of
the parents is not present. This may be because they have a revision
where the root id changed?

For that revision and its parent revisions, what are their root ids?
(I don't know off hand precisely how the conversion works but I would
start there.)

--
Martin

[Jeff Fortin Tam (kiddo)]

So, is there something I can do to help about this? Is it a bug in bzr or something that needs fixing in my branches? I'm kind of blocked my this problem at the moment, and I am not committing stuff in fear of worsening the problem.

[Alexander Belchenko (bialix)]

Today conversion from dirstate/pack to rich-root/rich-root-pack is completely broken. See bug #203607.

I think it's critical enough problem because it prevents people to upgrade or merge of branches.

[James Westby (james-w)]

Hi,

You can find a possible diagnosis of the problem
at

https://lists.ubuntu.com/archives/bazaar/2008q1/039340.html

Thanks,

James

[Martin Pool (mbp)]

@kiddo: as a workaround (though admittedly not a very attractive one), I would suggest that you make a new repository branched from the main branch, and move your changes across as a patch. In other words something like this:

  bzr init-repo --rich-root-pack ~/specto
  bzr branch http://bazaar.launchpad.net/~specto/specto/main ~/specto/main
  bzr branch ~/specto/main ~/specto/specto-woutc

adjust the path to suit; it should be a directory that does not already exist.

Then in your old directory, look back at the log to see when you diverged from the mainline, say revision 123, and do

  bzr diff -r 123 |patch -p0 -d ~/specto/specto-woutc

We can help you more with this on irc.

[Jeff Fortin Tam (kiddo)]

just for the logs, I tried doing the merge using bzr 1.0 instead of 1.2. Interestingly, bzr 1.0 goes further than 1.2 in the process, before dumping this traceback. I doubt it could be helpful, but who knows...

bzr: ERROR: exceptions.AssertionError:

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 802, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 758, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 492, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2868, in run
    conflict_count = merger.do_merge()
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 379, in do_merge
    **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 490, in __init__
    lambda t, c: conflict_pass(t, c, self.other_tree))
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 1782, in resolve_conflicts
    new_conflicts.update(pass_func(tt, conflicts))
  File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 490, in <lambda>
    lambda t, c: conflict_pass(t, c, self.other_tree))
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 1839, in conflict_pass
    tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
  File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 499, in version_file
    assert file_id is not None
AssertionError

bzr 1.0.0 on python 2.5.1.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '../specto-woutc', '-r2..52']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'fr_CA.UTF-8'
plugins:
  gtk /home/jeff/.bazaar/plugins/gtk [0.94.0dev0]
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  multiparent /usr/lib/python2.5/site-packages/bzrlib/plugins/multiparent.pyc [unknown]