Comment 10 for bug 113809

On Sun, Sep 28, 2008 at 5:04 PM, Mary Gardiner
<email address hidden> wrote:
> Unless/until the problems with the checkout model are resolved, I
> advocate that Bazaar not allow the "update" command to be used as
> readily in checkouts. Certainly it seems that "update" should
> essentially never be run in a working tree of a checkout with both
> unmerged local commits and totally uncommited changes. I would much
> rather deal with "Please commit all local changes with commit --local
> before updating from the master branch" than try to remember AGAIN which
> of foo.{BASE,OTHER,THIS}.moved are likely to be important and which ones
> I need to call "bzr resolve" on.

I think that could make sense. Alternatively perhaps it should just
do one merge at a time, then prompt the user to run update again.

--
Martin <http://launchpad.net/~mbp/>