[RFC] bound branches initial ui

[Robert Collins]

Hi, we've just talked through bound branches - whether to have unbind
--temp or a flag to commit to control when to pivot.

What we agree makes sense as first cut ui for 0.8 is:
 * use 'update' to update the bound branch against the boundee rather
than pull, because pull should pull from the parent branch. If there is
no working tree, update can still try to update the branch, but if there
is divergence give an error instructing the user to make a checkout and
then run update in it. If there is local divergence during an update,
the boundee's tip becomes a pending merge.
 * have commit by default operate in lockstep with the boundee branch.
If there is divergence it should instruct the user to either 'update' or
'commit --local' and then 'update'.
 * have 'commit' when there is local divergence *and* the branch is
either fully up to date with the boundee or has a pending merge of the
boundee's tip perform a logical pivot and commit against the boundee's
last-revision with the current divergence as a merge.
 * have commit --local to start local divergence - to replace the CVS
edit & edit & copy & edit sequence with edit & edit & commit --local &
edit.

We felt that three-valued modal interface 'bound or bound and offline or
not bound' was less clear than an entirely optional switch to 'commit'
which people can find out about when they are ready for it.

Seeking +1s and -1's.

Rob & Martin.
 

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060222/a9747109/attachment.pgp