[merge][#261315][1.7] RemoteBranch sets up stacking (more) correctly

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jonathan Lange wrote:
> On Tue, Sep 16, 2008 at 9:14 AM, Martin Pool <mbp at canonical.com> wrote:
>> Here's an updated patch that
>>
>>  * adds some helpers to test_remote so the tests are easier to read
>> and the failures are easier to understand
>>  * tests the case of a server that doesn't support this rpc
>>  * updates remote tests to expect Branch.get_stacked_on_url to happen
>> when the branch is opened
>>
>> I thought I sent this last night; I'm not sure why.
> 
> This patch has conflicts for me.
> 
> jml
> 

This *does* conflict with Andrew's "UnknownErrorFromSmartServer", the
code changes are relatively easy, the test changes are more difficult.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjQYhAACgkQJdeBCYSNAAME+wCgyslOzNmxPB5qlD85CyupMp4u
4DgAoJzpJct80ixxYc231HmrgOD5Ivwx
=TW0G
-----END PGP SIGNATURE-----