test_rebase.TestReplayWorkingtree.test_already_merged fails on bzr 0.90.0
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
bzr-rewrite |
Fix Released
|
Medium
|
Jelmer Vernooij |
Bug Description
=======
ERROR: test_already_merged (bzrlib.
vvvv[log from bzrlib.
created control directory in file://
creating repository in file://
creating branch <bzrlib.
trying to create missing lock '/tmp/testbzr-
opening working tree '/tmp/testbzr-
preparing to commit
Selecting files for commit with filter None
added revision_id {A}
opening working tree '/tmp/testbzr-
created control directory in file://
creating repository in file://
Using fetch logic to copy between KnitRepository(
fetch up to rev {None}
creating branch <bzrlib.
trying to create missing lock '/tmp/testbzr-
opening working tree '/tmp/testbzr-
opening working tree '/tmp/testbzr-
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(
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.
-------
Traceback (most recent call last):
File "/home/
newrev = newwt.branch.
File "/usr/lib/
return unbound(self, *args, **kwargs)
File "/usr/lib/
return self.get_
File "/usr/lib/
return unbound(self, *args, **kwargs)
File "/usr/lib/
return self.get_
File "/usr/lib/
return unbound(self, *args, **kwargs)
File "/usr/lib/
self.
File "/usr/lib/
texts = self._get_
File "/usr/lib/
raise errors.
NoSuchRevision: Branch <bzrlib.
-------
Changed in bzr-rebase: | |
assignee: | nobody → jelmer |
importance: | Undecided → Medium |
milestone: | none → 0.2 |
status: | New → Confirmed |
Changed in bzr-rebase: | |
status: | Confirmed → Fix Committed |
Changed in bzr-rebase: | |
status: | Fix Committed → Fix Released |