Bazaar

bzr merge --uncommitted fails with TypeError

Bug #516768 reported by Brad Crittenden
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
New
Undecided
Unassigned

Bug Description

% bzr merge --uncommitted ../trunk

Fails with:

   File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3759, in run
     merger = self.get_merger_from_uncommitted(tree, location, pb)
 TypeError: get_merger_from_uncommitted() takes exactly 5 arguments (4 given)

% bzr version
Bazaar (bzr) 2.1.0dev5

Revision history for this message
Neil Martinsen-Burrell (nmb) wrote :

This is a bug due to API skew between bzr-pipeline and recent versions of Bazaar. Updating your bzr-pipeline plugin to revision 153 should fix the problem.

To post a comment you must log in.
This report contains Public information  
Everyone can see this information.
Subscribing...

Other bug subscribers

Remote bug watches

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