Re: No commit in vc?

[Jan Djärv]

Eli Zaretskii skrev:
> > Date: Thu, 28 Jan 2010 08:25:47 +0100
> > From: Jan Djärv <address@hidden>
> >
> > Maybe I'm missing something obvious, but I can't find any way of doing commit 
> > from vc in Emacs (for bzr).
> >
> > I did what "Doing Quick Fixes" says in BzrForEmacsDevs.  I then did C-x v d 
> > ..., and then v, <type comment> C-c C-c.
> >
> > Bzr then complains it can't do single file commits for merges (whatever that 
> > means).
>
> Can you show what bzr commands are invoked by VC when you type C-x v d
> and C-c C-c?

Here is the part from .bzr-log, the exact error message I got was 
"Selected-file commit of merges is not supported yet: files src/xfns.c".  It 
is at the bottom.  It looks like it is doing a commit.

tor 2010-01-28 08:12:28 +0100
0.027  bzr arguments: [u'commit', u'-m', u'Revert code for bug #3643.\nxfns.c 
(Fx_create_frame): Remove window size matching code 
from\n2010-01-15.\n(x_get_current_desktop, x_get_desktop_workarea): Remove\n', 
u'xfns.c']
0.041  looking for plugins in /home/jhd/.bazaar/plugins
0.041  looking for plugins in /usr/lib/python2.6/dist-packages/bzrlib/plugins
0.143  encoding stdout as osutils.get_user_encoding() 'UTF-8'
0.206  opening working tree '/home/jhd/src/emacs/trunk'
0.305  ssh implementation is OpenSSH
12.322  preparing to commit
26.054  Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 842, in 
exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1037, in 
run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 654, in 
run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3058, in run
    exclude=safe_relpath_files(tree, exclude))
  File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 192, in 
write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 197, 
in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 192, in 
write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/mutabletree.py", line 229, in 
commit
    *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 339, in commit
    raise errors.CannotCommitSelectedFileMerge(self.specific_files)
CannotCommitSelectedFileMerge: Selected-file commit of merges is not supported 
yet: files src/xfns.c

26.054  return code 3


        Jan D.