bzr merge --uncommitted does not work

[Nicholas Allen]

Hi,

I have 2 branches and I made changes in the wrong branch. I decided to
merge the changes from the other branch's working copy using the
following command:

bzr merge --uncommitted ../selfcompilable

But bzr prints the following stack trace:

~/source/bzr.dev/bzr merge --uncommitted ../selfcompilable
bzr: ERROR: exceptions.TypeError: run() got an unexpected keyword
argument 'uncommitted'

Traceback (most recent call last):
  File "/home/nick/source/bzr.dev/bzrlib/commands.py", line 626, in
run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/nick/source/bzr.dev/bzrlib/commands.py", line 588, in run_bzr
    ret = run(*run_argv)
  File "/home/nick/source/bzr.dev/bzrlib/commands.py", line 292, in
run_argv_aliases
    return self.run(**all_cmd_args)
TypeError: run() got an unexpected keyword argument 'uncommitted'

bzr 0.13.0dev0 on python 2.4.4.candidate.1 (linux2)
arguments: ['/home/nick/source/bzr.dev/bzr', 'merge', '--uncommitted',
'../selfcompilable']


I have also submitted this as Bug #73191

Cheers,

Nick