[MERGE] support updating lightweight checkouts of readonly branches

[Aaron Bentley]

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

Robert Collins wrote:
> On Tue, 2006-10-17 at 22:40 -0400, Aaron Bentley wrote:
> 
> +1 from me, with a couple of wishlist items
> 
> it would be nice if we can fix the layering so that the builtins.py
> cmd_update does not need to lock the tree and fiddle at all. Ideas on
> how appreciated ;).

Well, what I'm ultimately expecting is

#pseudocode
conflicts = tree.tree_update()
if conflicts != []:
    print_conflicts(conflicts)
    return 1

if tree.branch.get_master_branch():
    branch.update()
    conflicts = tree.tree_update()
    if conflicts != []:
        print_conflicts(conflicts)
        return 1

This might be a helper function, or it could be in cmd_update.run

> Perhaps this should wait for 0.13? I'm not sure - John is the RM, so
> what does he say?

I was minimizing the changes to keep it acceptable to 0.12.  If we bump
it for 0.13, I'll get more invasive.  John?

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

iD8DBQFFNayM0F+nu1YWqI0RAkyxAJ44uhQwm7Bc/pcM8sPJ+OxrS7B2xQCcCGXC
vlt9I+Mzlae5xrNVuIZCNaI=
=RRly
-----END PGP SIGNATURE-----