> I wanted to commit a
> line endings change to shootout.t in lua, but when I went 'svk push' I
> got an "Empty commit message" error again and the only way I know to
> fix this is to use 'svk merge -c <revision_number> //parrot/local/
> //parrot/remote -m "a non-empty commit message"', then it seems to
> commit everything back.

Do you do 'svk pull' *immediately* before you push?  Are you working on a
mirrored copy?

I'm working from a mirrored copy, and my usual work cycle is:

svk up -sm
... edit stuff ...
svk commit <files>
(svk smerge -C //parrot/local //parrot/remote)
svk push (which used to be svk smerge -Il --verbatim //parrot/local
//parrot/remote, until I had a discussion with Coke about svk and he
said he only used svk push)

The problems started occurring with empty commit messages when I was
still using just smerge.  This is what was recommended on the svk
wiki.

Paul

Reply via email to