[svk-devel] Edit/addition of previous commit logs?

Stig Brautaset stig at brautaset.org
Sun Jan 7 14:28:44 EST 2007


>> I expect this is a problem because you want to smerge iteratively.
>> Try smerge iteratively _up to_ the problematic patch[0], merge that
>> patch over manually with merge -c and a commit message, then smerge
>> iteratively up to HEAD, something like this:
>>         svk smerge -I //local/foo at rXXX-1 //remote/foo
>>         svk merge -c XXX //local/foo //remote/foo
>>         svk smerge -I //local/foo //remote/foo
> The problem seems to be occurring because parrot recently implemented
> a pre-commit check for empty commit messages. It's possible that the
> problem is caused by me using a 'smerge' rather than a 'push'.  At
> present 'push' seems to work alright.

Yes, that was obvious to me, but I could have spelled it out more  
clearly in my response. That's why I suggested merging the  
problematic patch manually, thus adding a commit message. I'm a bit  
confounded that this didn't work for you, but that push did, but on  
the other hand I'm happy that you now have a work-around for your  


More information about the svk-devel mailing list