Comment 3 for bug 175589
Revision history for this message
| Robert Collins (lifeless) wrote Re: [Bug 175589] Re: suggested update when bound branch is out of date does confusing things | #3 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
0e1f616
(Get the code!)
On Sun, 2009-04-05 at 13:32 +0000, Wouter van Heyst wrote:
> Bug #113809 is part of it, but imho that is not the main cause (and thus
> no duplicate).
>
> That `bzr update` in a checkout which hasn't diverged, just has extra
> revisions, pivots the local revisions away contradicts what I'd expect
> to happen. That the pivot requires merges, combined with uncommitted
> changes and #113809 does then also mess up your working tree.
>
> I know the pivot behaviour of update has been discussed in the past, but
> I can't find a bug for it now.
Here is the contract for update (light and heavy):
'update prepares you to commit to the branch after doing some
uncommitted work'.
Implications->
'update && revert' -> now the same as the branch
'update && commit' -> your local work is now on the branch.
-Rob