Code review comment for lp:~gz/bzr/trivial_conflicts_tests_need_feature
Revision history for this message
| Andrew Bennetts (spiv) wrote | # |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
35a32c5
(Get the code!)
Jelmer Vernooij wrote:
[…]
> > -from bzrlib.tests import script
> > +from bzrlib.tests import script, UnicodeFilename
>
> We're usually writing these imports on several lines now, to make
> merging less problematic. I guess it's not really a big deal in this
> case.
It'd be neat if someone wrote a per-file merger that could handle
merging import lines of a .py file…
-Andrew