Re: No commit in vc?

[Óscar Fuentes]

Jan Djärv <address@hidden> writes:

> 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).

Let me guess:

bzr merge
<hack hack>
bzr commit foo.c
<cannot do single file commits for merges>

On this scenario, the `merge' modifies some files and sets a `pending
merge tips' status flag (visible with `bzr st') At this point, you must
commit the whole merge, not just a subset of the modified files:

bzr merge
<resolve conflicts, if any>
bzr commit
<hack hack>
bzr commit foo.c