Bazaar

  1. Bug #113809
  2. Comment #24

Comment 24 for bug 113809

Revision history for this message
Craig Hewetson (craighewetson-deactivatedaccount) wrote : Re: [Bug 113809] Re: update performs two merges

Hi Tim

Please tell me what to do inorder to test it.
>
>

Well you would need to install the source code from this branch. If you make
use of the python based installation of bazaar it would be easier to install
the source.
1) bzr branch --stacked lp:~craighewetson/bzr/update_with_local_commit
2) python setup.py install

Alternatively:
A quick and dirty way to test it would be to have bzr 1.17.1 installed and
then just backup your existing builtins.py and copy the builtins.py from the
above branch in to the bzrlib directory.

Test this bug for a test project and then once you are done restore you
builtins.py file.

BTW:
I haven't bothered changing the file back and I actively use bzr 1.17.1 with
this patched file, without any problems.

If you have any questions or need me to compile the code into an exe then
let me know.