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

[Paul Cochrane]

Stig,

> 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

Thanks heaps for your reply.  Unfortunately, I'm still getting the
problem after following your advice :-(

Here's what I'm getting:

a basic smerge looks like this:


cochrane at avon parrot $ svk smerge -Il //parrot/local //parrot/remote
Auto-merging (24763, 24782) /parrot/local to /parrot/remote (base
/parrot/remote:24781).
===> Auto-merging (24763, 24770) /parrot/local to /parrot/remote (base
/parrot/remote:24769).
Merging back to mirror source https://svn.perl.org/parrot/trunk.
g   lib/Parrot/Distribution.pm
G   MANIFEST
g   MANIFEST.generated
g   languages/cola/gen.c
New merge ticket: 2d5eba5e-1c16-0410-82ce-edad0cc2a1fc:/parrot/local:24770
A repository hook failed: MERGE request failed on '/parrot/trunk':
'pre-commit' hook failed with error output:

***  Commit message is empty  ***

Then if I try to smerge up to the failing patch (24770 in this case) I get this:

cochrane at avon parrot $ svk smerge -Il //parrot/local at 24769 //parrot/remote
Auto-merging (24763, 24763) /parrot/local to /parrot/remote (base
/parrot/local:24763).
Empty merge.

If I do this up to 24770 exactly, I get the same output as without
specifying a revision.  Using svk merge -c 24770 //parrot/local
//parrot/remote adds a commit message to the repository, but still
doesn't allow me to smerge back again (I get the same error message
and output as above).

Just to improve my understanding of what svk is doing, what is it
sending back to the server when one gets such output:

Auto-merging (24763, 24782) /parrot/local to /parrot/remote (base
/parrot/remote:24781).
===> Auto-merging (24763, 24770) /parrot/local to /parrot/remote (base
/parrot/remote:24769).
Merging back to mirror source https://svn.perl.org/parrot/trunk.
g   lib/Parrot/Distribution.pm
G   MANIFEST
g   MANIFEST.generated
g   languages/cola/gen.c
New merge ticket: 2d5eba5e-1c16-0410-82ce-edad0cc2a1fc:/parrot/local:24770
A repository hook failed: MERGE request failed on '/parrot/trunk':
'pre-commit' hook failed with error output:

***  Commit message is empty  ***

Namely, is it trying to send an *svn* commit back to the server
relevant to the [gG] files or is it trying to do something locally?

Many thanks in advance!

Paul