On Mon, 04 Jun 2007, Daniel Rall wrote:
> On Mon, 04 Jun 2007, Mark Phippard wrote:
>
> > On 6/4/07, Hyrum K. Wright <hyrum_wright@mail.utexas.edu> wrote:
> > >Ben Collins-Sussman wrote:
> > >> 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...
> > >
> > >Yah, I couple of JavaHL wrapper files needed to be updated. Done in
> > >r25285.
> >
> > Thanks, but one problem I see in this notification is that it does not
> > appear to contain information on the revisions being merged. I'd like
> > to get that information. At a minimum, so I can provide output like
> > the command line, but I also might just need that information for my
> > merge client.
>
> The merge_range field which was added to svn_wc_notify_t also needs to
> be represented on the Java side, and potentially implemented as in the
> svn_wc_notify_merge_begin case in subversion/svn/notify.c:notify().
I started this, and indicated how to finish it, in r25291.
- application/pgp-signature attachment: stored
Received on Tue Jun 5 02:46:57 2007