[patch] fix bug 48136 bzr status, diff, etc do not work properly after remote push

Aaron Bentley aaron.bentley at utoronto.ca
Fri Oct 27 16:53:39 BST 2006


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

John Arbash Meinel wrote:
> Aaron Bentley wrote:
> 
>>Using heavyweight checkouts instead of lightweight ones with remote
>>branches is just a convention.  So doing this does require a connection
>>to the branch, which is a new requirement.

> Well, at present because of the way 'BranchReference' is defined, we
> always connect to the remote branch, for any lightweight checkout.

Right.  That's why I phrased it as I did.

> I would be okay with it as part of the regular status information, but
> I'm not sure where to put it.

> % bzr status
> added:
>   foo
>   bar/
> modified:
>   baz
> conflicts:
>   Text conflict in bling
> pending merges:
>   Joe Foo 2006-10-27 Message from beyond
> info:
>   Local tree is out of date with branch, use 'bzr update'
You could do

out of date (use "bzr update"):
    branch is at: "Fixed a really nasty bug"

But I'm fine to put it in as the warning, and then worry about tweakage.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFQiuD0F+nu1YWqI0RAmTEAJ46JqUJ7E0ElYOyWmbqiW/9fdgGsgCghQKr
o0BIxy8ZC53+NJiDpOkdDFo=
=MKx6
-----END PGP SIGNATURE-----




More information about the bazaar mailing list