Jan Djärv <address@hidden> writes:
As mentioned on my response to Jason, it seems that bzr does not admit a
`commit' comand with a list of files when there is a pending merge. The
solution for this is to not mark files in VC-dir, but put the point on
the `./' entry at the top and press `v' there. This commits all changes
on the current working tree, which keeps bzr happy.
I didn't mark any files. Probably vc takes that to mean the same as
marking edited files. This is a bug in vc that it tries to check in
individual files.
But was the point over a file or on the top of the VC-dir buffer? If the
point was over a file, VC-dir commits that file.