how to revert update operation

[Robert Collins]

On Tue, 2006-07-18 at 10:19 -0500, John Arbash Meinel wrote:


> I *think* we forbid update if there are local commits, and some
> uncommitted changes. If it doesn't, it probably should.

Hell no - the intent of update is that you update *before* committing,
when someone else beat you to the punch committing on a shared branch.
..


> I think the code is doing 'merge this into other' which creates a state,
> and then does 'merge state into this' to update the working tree.
> 
> The difficulty is that you don't want to just merge other into this (you
> have bzr merge for that). You want to replace this with that, and merge
> the original this.

Its doing a merge between 4 interesting trees, rather than the usual 3 -
see my email to Aaron for details.

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: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060719/9e301577/attachment.pgp