switch (was Re: If bzrtools commands aren't experimental, merge them into bzr)

Robert Collins robertc at robertcollins.net
Tue Nov 20 08:21:09 GMT 2007


On Thu, 2007-11-15 at 11:35 -0500, Aaron Bentley wrote:
> 
> > I really would like to have switch brought into core. I would really
> prefer if
> > it supported heavy checkouts.
> 
> Sure.  There's the edge case where the checkout has a different
> last-revision from the branch.  I think the reasonable way to resolve
> that is to error out, asking the user to run "update" first. 

Given switch's conceptual behaviour, I would simply merge from the
tree's last revision and ignore any difference with the branch. This
avoids the race condition of the branch getting many commits and having
to update just so you can switch away from it.

-Rob
-- 
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/20071120/88a0a5bb/attachment-0001.pgp 


More information about the bazaar mailing list