[MERGE] conflicts --text

John A Meinel john at arbash-meinel.com
Tue Dec 5 22:25:00 GMT 2006


John Arbash Meinel has voted +1.
Status is now: Approved
Comment:
Looks fine to me. Though the test you are modifying looks like it could really use some cleanup. For example, we should be using tree.rename_one() rather than run_bzr('mv x y') sort of things.

For details, see: http://bundlebuggy.aaronbentley.com/request/%3C4575F09A.1080108%40utoronto.ca%3E




More information about the bazaar mailing list