Comment 7 for bug 127115
Revision history for this message
| Wouter van Heyst (larstiq) wrote Re: dirstate breaks (traceback) merge --uncommitted | #7 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
1b1ed1a
(Get the code!)
bzr-bisect is a little broken, but it still helped to determine this got broken in r2617, 'Improve merge speed'. Sepcifically <email address hidden>
removed the checking for self.other_rev_id being None.