Merge lp:~russell-sim/python-mode/bp-remote into lp:python-mode

[Russell Sim]

This remote shell's patch should be fine for a merge now, I have run the test suite and everything passed. It's probably too hard for the time being to add a remote editing test, because without using a different host the functionality could break and the test would still pass because the file would be accessible locally.

[Andreas Roehler (a-roehler)]

see comment at lp:~russell-sim/python-mode/improved-test-runner

BTW if possible, branch from latest trunk - seems okay at the moment, don't expect any conflict for now.

Best,

Andreas

[Russell Sim (russell-sim)]

Andreas Roehler <email address hidden> writes:

> see comment at lp:~russell-sim/python-mode/improved-test-runner
>
> BTW if possible, branch from latest trunk - seems okay at the moment,
> don't expect any conflict for now.

Bzr doesn't seem to have a rebase function. Do you mind if I just keep
the branch upto date by merging trunk into it?

[Andreas Roehler (a-roehler)]

Am 22.07.2012 10:13, schrieb Russell Sim:
> Andreas Roehler <email address hidden> writes:
>
>> see comment at lp:~russell-sim/python-mode/improved-test-runner
>>
>> BTW if possible, branch from latest trunk - seems okay at the moment,
>> don't expect any conflict for now.
>
> Bzr doesn't seem to have a rebase function. Do you mind if I just keep
> the branch upto date by merging trunk into it?
>

think so. Otherwise I must check all the diffs between, resp. might face merge conflicts.
Not being a bazaar expert, maybe Barry has a different suggestion.
CC to Barry

Cheers,

Andreas

=== modified file 'NEWS'
--- NEWS	2012-07-24 12:39:51 +0000
+++ NEWS	2012-07-26 00:16:20 +0000
@@ -22,6 +22,9 @@
   whitespaces by the way. When editing other peoples
   code, this may produce a larger diff than expected 
 
+- remote shells using tramp.  Be sure that if you want a remote shell
+  that you open the python shell while visiting a remote file.
+
 New in version 6.0.9
 --------------------