bad error on selective commit of merge

[Martin Pool]

bzr: ERROR: exceptions.NotImplementedError: ('selected-file commit of merges is not supported yet: files %r', [u'doc/kiel-make.sh'])

Traceback (most recent call last):
  File "/home/jpi/lib/python/bzrlib/commands.py", line 612, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/jpi/lib/python/bzrlib/commands.py", line 574, in run_bzr
    ret = run(*run_argv)
  File "/home/jpi/lib/python/bzrlib/commands.py", line 283, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/jpi/lib/python/bzrlib/builtins.py", line 1757, in run
    reporter=reporter)
  File "/home/jpi/lib/python/bzrlib/decorators.py", line 51, in write_locked
    return unbound(self, *args, **kwargs)
  File "/home/jpi/lib/python/bzrlib/workingtree.py", line 538, in commit
    committed_id = Commit().commit( working_tree=self, revprops=revprops,
  File "/home/jpi/lib/python/bzrlib/commit.py", line 281, in commit
    self.specific_files)
NotImplementedError: ('selected-file commit of merges is not supported yet: files %r', [u'doc/kiel-make.sh'])

bzr 0.10.0 on python 2.4.2.final.0 (sunos5)
arguments: ['/home/jpi/bin/bzr', 'commit', 'doc/kiel-make.sh']

** please send this report to <email address hidden>

[Martin Pool (mbp)]

In the short term this just needs a better message.

In the mid term we should allow selective commit of merges.

[John A Meinel (jameinel)]

I'm not sure how to allow selective commit of merges... Maybe it will make more sense when we have cherrypicking.

In the mean time, fixing the exception should be done. This gets 'high' because it is an easy fix.

[Aaron Bentley (abentley)]

Forgot this was an open bug when I fixed it. (We now get a good error on selected-file commit of merges)

[Craig Hewetson (craighewetson-deactivatedaccount)]

Is there a bug to implement the selective commit of a merges?
Just had the need to commit a single file when local commits exist.

[Martin Pool (mbp)]

On 23 September 2010 19:24, Craig Hewetson <email address hidden> wrote:
> Is there a bug to implement the selective commit of a merges?
> Just had the need to commit a single file when local commits exist.

I can't find one, please file if you like.

--
Martin