[RFC] bound branches initial ui

[John Arbash Meinel]

Robert Collins wrote:
> On Tue, 2006-02-21 at 21:55 -0600, John Arbash Meinel wrote:
>> Robert Collins wrote:
>> ...> You have local commits. Please resolve the conflicts and then run 'bzr
>>> commit' to send your local commits to the master, or 'bzr commit
>>> --local' to record that you are now up to date with the master.
>>> $ bzr revert
>>> $ bzr st
>>>
>> Well, if 'bzr commit' does the pivot, then it seems okay to have 'bzr
>> update' prepare the branch such that a commit will make it pivot.
>> As long as you haven't actually changed my 'revision-history' yet, so I
>> can 'bzr revert' and get back to a branch with only my changes.
> 
> Yup.
> 
> 
>>>>  bzr update
>>>>  !! Oh shit I don't want this, how do I go back
>>>>  bzr revert
>>>>  !! Where did all my changes go
>>>>
>>>> So I guess I'm +0.5
>>> I hope my comments above clarify the 'update + revert' case - but I dont
>>> see that its any different in the above proposal to 'update + revert'
>>> with a 'checkout' - and thats deliberate.
>>>
>>> Rob
>> Update + revert with a checkout means I lose my changes. update+revert
>> with a diverged bound branch should lose the master changes. I do see
>> them being different.
> 
> Well, I meant more that 
> update + revert: 'trashes uncommitted data'
> in both cases. The basis it reverts to in both cases is also 'the last
> commit'.
> 
>> With a non-diverged bound branch, then we definitely should strive to
>> have near identical actions as a checkout. It is just a heavy checkout
>> which lets me diverge/go offline if I ask it to. Without having to plan
>> ahead. (I can convert a checkout to an offline branch if I think about
>> it before I pack my bags, but not once I'm on the plane).
> 
> Yes.
> 
> So are we at +1 ?
> 
> Rob
> 

I'll give you a sleepy +1. Hopefully I'll feel okay with it tomorrow. :)

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060221/4fbf0471/attachment.pgp