speed of bzr merge with uncommited changes

[ChriS]

bzr merge rightly refuses to work when the branch has uncommited changes. However, before giving that message, it does access the network! It would be better speedwise to first check whether the branch has uncommited changes and only then access the remote branch.

[tebeka (miki-tebeka)]

Second that, I find it highly annoying as well.

[Berto (bertosmailbox)]

It's happened to me way too many times that after a good amount of time a merge fails because I have uncommitted changes. bzr should definitely check the local state first.

[Berto (bertosmailbox)]

I'm not sure if this is the best way to do it, but I've put together a patch that checks for uncommitted changes before doing much other work in the merge command:

http://bazaar.launchpad.net/~bertosmailbox/bzr/bzr/revision/4038

This branch is located at:

lp:~bertosmailbox/bzr/bzr

Any comments are welcome, thanks!

[Ian Clatworthy (ian-clatworthy)]

Berto wrote:
> I'm not sure if this is the best way to do it, but I've put together a
> patch that checks for uncommitted changes before doing much other work
> in the merge command:
>
> http://bazaar.launchpad.net/~bertosmailbox/bzr/bzr/revision/4038
>
> This branch is located at:
>
> lp:~bertosmailbox/bzr/bzr
>
> Any comments are welcome, thanks!
>
Cool! Can you please submit this as a merge directive so we can track
it in Bundle Buggy? It's as simply as ...

  bzr send -o ../check-uncommitted-before-merge.patch
  attach that file to an email send to the list with a subject of [MERGE] ...

Ian C.