bzr update merges changes even with uncommitted changes

[Martin Pool]

On Thu, 2008-12-11 at 13:47 -0600, Brian de Alwis wrote:
> On 11-Dec-2008, at 10:25 AM, Marius Kruger wrote:
> > My situation is where I had _local_ commits before I bound the
> > branch.
> > To make it worse, I wasn't ready to commit either.
> > Maybe it would be reasonable to refuse to "convert local commit to
> > pending merges"
> > if the tree isn't clean.
> > 
> 
> 
> I had this exact same situation occur to me yesterday: I bound a
> branch with local commits and the commits were wiped.  I'd have
> preferred 'bind' to warn that the tip had changed, and that the old
> tip was available as revid:... much like is now done in 'revert'.
> 
Let's pick this up in Mary's thread about checkouts.
> 
> The bzrtools 'heads --dead-only' command was very helpful.  Is the
> heads functionality not worthy of being pulled into core?

I'd like to bring it in.
> 

-- 
Martin