[MERGE] harmonize run_bzr_subprocess with run_bzr
John Arbash Meinel
john at arbash-meinel.com
Tue Aug 7 18:58:30 BST 2007
John Arbash Meinel has voted tweak.
Status is now: Conditionally approved
+ symbol_versioning.warn(zero_nineteen %
+ "passing varargs to run_bzr",
+ DeprecationWarning, stacklevel=3)
This should probably be complaining about 'run_bzr_subprocess', not
- err = self.run_bzr_subprocess('merge', '--merge-type', 'magic
+ err = self.run_bzr_subprocess('merge --merge-type magic\
^- This is one of those cases where using the list form is a lot more
Also, you happened to get lucky that python doesn't have an escape for '
' so it treats '\ ' as r'\ '. It really should have been written '\\ '.
(or including the 'r' variant).
Otherwise, I think run_bzr_subprocess should be updated, and you did
For details, see:
More information about the bazaar