unable to do merge on windows

this bug was fixed in bzr 1.3. Try to upgrade to 1.3 or newer version.

alright, I will, thanks!

On Sun, Apr 13, 2008 at 1:40 AM, Alexander Belchenko <email address hidden> wrote:
> this bug was fixed in bzr 1.3. Try to upgrade to 1.3 or newer version.
>
> ** Changed in: bzr
> Status: New => Fix Released
>
> --
> unable to do merge on windows
> https://bugs.launchpad.net/bugs/216542
> You received this bug notification because you are a direct subscriber
> of the bug.
>
> Status in Bazaar Version Control System: Fix Released
>
>
> Bug description:
> Try to issue a 'bzr merge' command on a freshly obtained branch (lp:relex). Apparently I have to specify some encoding but don't know where and how. Anyway, I got the following:
>
> >bzr merge
> bzr: ERROR: exceptions.AssertionError: you cannot specify None for the display encoding.
>
> Traceback (most recent call last):
> File "bzrlib\commands.pyc", line 834, in run_bzr_catch_errors
> File "bzrlib\commands.pyc", line 790, in run_bzr
> File "bzrlib\commands.pyc", line 492, in run_argv_aliases
> File "bzrlib\builtins.pyc", line 2846, in run
> File "bzrlib\builtins.pyc", line 2917, in _get_merger_from_branch
> File "bzrlib\builtins.pyc", line 2984, in _select_branch_location
> File "bzrlib\builtins.pyc", line 3001, in _get_remembered
> File "bzrlib\urlutils.pyc", line 576, in unescape_for_display
> AssertionError: you cannot specify None for the display encoding.
>
> bzr 1.2.0 on python 2.5.1.final.0 (win32)
> arguments: ['c:\\tools\\Bazaar\\bzr.exe', 'merge']
> encoding: 'cp1252', fsenc: 'mbcs', lang: None
> plugins:
> launchpad c:\tools\Bazaar\lib\library.zip\bzrlib\plugins\launchpad [unknown]
> *** Bazaar has encountered an internal error.
> Please report a bug at https://bugs.launchpad.net/bzr/+filebug
> including this traceback, and a description of what you
> were doing when the error occurred.
>

--
"Frozen brains tell no tales."

-- Buckethead