[MERGE] Branch format 6

[Aaron Bentley]

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

Robert Collins wrote:
> On Sun, 2007-02-11 at 16:18 -0500, Aaron Bentley wrote:

>>It means that if you have a heavyweight checkout but no access to the
>>master branch, you can "unbind", do a series of commits (without
>>--local) and finally bind when the branch becomes available again.
> 
> 
> -0 - I think that this adds more state to the branch, which has to then
> be explained and understood.

There's no question that it adds state, but I think the cognitive cost
is fairly low.

It seemed counterintuitive to that "unbind" actually meant "forget bind
location".  So now, "unbind" now actually does what I would expect it to do.

It also maintains our pattern of remembering the URLs provided to
commands and reusing them.  So we actually reduce complexity there.

And since it only adds functionality, you don't have to know about the
additional state until you run "bind" with no arguments.

So to me, it seems like a worthwhile tradeoff.

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

iD8DBQFF0KuS0F+nu1YWqI0RAm+SAJ9INTGJ3fXVf9uM3+UXmPyDFnnFowCdGfG9
jxjiV3tOyZUVIT2bxUaO2zQ=
=/8iF
-----END PGP SIGNATURE-----