Sounds like you need to rebuild JavaHL somehow. The action type being
sent is a new positive integer value, an enumerated type called
'svn_wc_notify_merge_begin'. You can see it defined in svn_wc.h, in
the enumeration 'svn_wc_notify_action_t'.
This new action field is definitely being sent when the merge code
calls the notification callback. The svn commandline client
specifically looks for the new action value and prints the new text
(see subversion/svn/notify.c:413).
I don't know how JavaHL is built, but it sounds like somehow svn_wc.h
needs to be re-scanned so that the new values are available to Java
code...
On 6/4/07, Mark Phippard <markphip@gmail.com> wrote:
> This is for sussman or anyone else that wants to take it on.
>
> The new merge notification feature sends through something like this
> when run from the command line:
>
> --- Merging revisions 5-16:
> D products/little.html
> D products/big.html
> A products/medium
> A products/medium/roadmap.html
>
> When using JavaHL, we typically receive each of these notifications so
> that we can create similar looking output. I imagine it is just
> structured similarly to how it is done in the native libraries. There
> is an action field with a numeric indentifier and then some data
> fields.
>
> Anyway, when this new notification comes through, we are getting an
> Action of -1, which usually is what you get when a command fails. I
> am not sure what needs to be done, and where (although I think it is
> all just mostly done in the C libraries). In JavaHL we will need the
> data so that we can create similar looking output to above. So I
> imagine that is a new identifier for this merge revisions line, along
> with the revisions that are being merged.
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 4 23:06:18 2007