test_rebase.TestReplayWorkingtree.test_already_merged fails on bzr 0.90.0

Bug #144033 reported by Pieter Nagel
2
Affects Status Importance Assigned to Milestone
bzr-rewrite
Fix Released
Medium
Jelmer Vernooij

Bug Description

======================================================================
ERROR: test_already_merged (bzrlib.plugins.rebase.test_rebase.TestReplayWorkingtree)

vvvv[log from bzrlib.plugins.rebase.test_rebase.TestReplayWorkingtree.test_already_merged]
created control directory in file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/old/
creating repository in file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/old/.bzr/.
creating branch <bzrlib.branch.BzrBranchFormat5 object at 0x979196c> in file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/old/.bzr/
trying to create missing lock '/tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/old/.bzr/checkout/dirstate'
opening working tree '/tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/old'
preparing to commit
Selecting files for commit with filter None
added revision_id {A}
opening working tree '/tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/old'
created control directory in file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/new/
creating repository in file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/new/.bzr/.
Using fetch logic to copy between KnitRepository('file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/old/.bzr/')(<RepositoryFormatKnit1>) and KnitRepository('file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/new/.bzr/')(<RepositoryFormatKnit1>)
fetch up to rev {None}
creating branch <bzrlib.branch.BzrBranchFormat5 object at 0x84bafac> in file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/new/.bzr/
trying to create missing lock '/tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/new/.bzr/checkout/dirstate'
opening working tree '/tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/new'
opening working tree '/tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/new'
preparing to commit
Selecting files for commit with filter None
added revision_id {B}
preparing to commit
Selecting files for commit with filter None
added revision_id {C}
preparing to commit
Selecting files for commit with filter None
added revision_id {D}
preparing to commit
commit parent ghost revision {B}
Selecting files for commit with filter None
added revision_id {E}
Using fetch logic to copy between KnitRepository('file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/old/.bzr/')(<RepositoryFormatKnit1>) and KnitRepository('file:///tmp/testbzr-22PsKT.tmp/tmpnNRRJk/work/new/.bzr/')(<RepositoryFormatKnit1>)
fetch up to rev {None}
    INFO All changes applied successfully.
preparing to commit
Selecting files for commit with filter None
added revision_id {D'}
 WARNING Text conflict in bfile
    INFO 1 conflicts encountered.
preparing to commit
bfile: <<<<<<< TREE
D
=======
D
E
>>>>>>> MERGE-SOURCE

^^^^[log from bzrlib.plugins.rebase.test_rebase.TestReplayWorkingtree.test_already_merged]
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pieter/.bazaar/plugins/rebase/test_rebase.py", line 561, in test_already_merged
    newrev = newwt.branch.repository.get_revision("E'")
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repofmt/knitrepo.py", line 133, in get_revision
    return self.get_revision_reconcile(revision_id)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 563, in get_revision_reconcile
    return self.get_revisions([revision_id])[0]
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 127, in read_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/repository.py", line 569, 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)
NoSuchRevision: Branch <bzrlib.store.revision.knit.KnitRevisionStore object at 0x97a09ac> has no revision E'

----------------------------------------------------------------------

Jelmer Vernooij (jelmer)
Changed in bzr-rebase:
assignee: nobody → jelmer
importance: Undecided → Medium
milestone: none → 0.2
status: New → Confirmed
Jelmer Vernooij (jelmer)
Changed in bzr-rebase:
status: Confirmed → Fix Committed
Jelmer Vernooij (jelmer)
Changed in bzr-rebase:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.