implement HgWorkingTree.conflicts()

Bug #731353 reported by Jelmer Vernooij
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar Hg Plugin

Bug Description

Traceback (most recent call last):
File "/usr/lib/python2.7/dist-packages/testtools/", line 169, in _run_user
return fn(*args, **kwargs)
File "/usr/lib/python2.7/dist-packages/testtools/", line 508, in _run_test_method
return self._get_test_method()()
File "/home/jelmer/bzr-alltests/", line 226, in test_conflicts
self.assertIsInstance(tree.conflicts(), conflicts.ConflictList)
File "/home/jelmer/bzr-alltests/", line 2433, in conflicts
raise NotImplementedError(self.conflicts)
NotImplementedError: <bound method HgWorkingTree.conflicts of <HgWorkingTree of /tmp/testbzr-ratX8g.tmp/bzrlib.tests.per_tree.test_tree.TestConflicts.test_conflicts(HgWorkingTreeFormat)/work/wt>>

Revision history for this message
Vincent Ladeuil (vila) wrote :

I'd love to get rid of ConflictList in favor of a regular list (when time permits :-/), so keep me in the loop once you start working on that.

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.