bzr update merges changes even with uncommitted changes
amanic at gmail.com
Thu Dec 11 16:53:30 GMT 2008
2008/12/11 John Arbash Meinel <john at arbash-meinel.com>
> 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 can certainly agree with having update check if there are local
> changes and uncommitted changes. I think there are some open bugs on
> this, about "update" doing 2 merges, and potentially getting conflicts
> in your conflicts.
thanks I found them
I'll put it on my todo list.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the bazaar