2008/12/11 John Arbash Meinel <span dir="ltr"><<a href="mailto:john@arbash-meinel.com">john@arbash-meinel.com</a>></span><br><div class="gmail_quote"><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"> <div class="Ih2E3d">Marius Kruger wrote:<br> <br></div>...<br> <div class="Ih2E3d"><br> > My situation is where I had _local_ commits before I bound the branch.<br> > To make it worse, I wasn't ready to commit either.<br> > Maybe it would be reasonable to refuse to "convert local commit to<br> > pending merges"<br> > if the tree isn't clean.<br> ><br> <br> </div>I can certainly agree with having update check if there are local<br> changes and uncommitted changes. I think there are some open bugs on<br> this, about "update" doing 2 merges, and potentially getting conflicts<br> in your conflicts.</blockquote><div><br>thanks I found them<br><a href="https://bugs.launchpad.net/bzr/+bug/113809">https://bugs.launchpad.net/bzr/+bug/113809</a><br><a href="https://bugs.launchpad.net/bzr/+bug/236724">https://bugs.launchpad.net/bzr/+bug/236724</a><br>  </div></div>I'll put it on my todo list.<br><br>regards<br>marius<br>