Re: [PATCH] resolve SVN conflicts

["Stephen Kennedy" <stevek gnome org>]

Thanks Matthijs, thanks for your work. I had a look at your patch and
have commented on bugzilla too.

I'm a little wary of introducing UI which only works for one vc system.

I've added stubs to the VC base object so that vcview can enquire
which methods are optionally supported. (VC.get_capabilities()). Can
you change the patch so that vcview only shows the resolve UI when it
is supported?

Thanks,
Stephen.


On 8/14/07, Matthijs van de Water <matthijs van de water gmail com> wrote:
> Hi,
>
> I've been using Meld to resolve SVN conflicts for some time now and
> was annoyed by the fact it didn't have a menu-option to mark a
> conflicted file as resolved.
>
> I've made a patch which works for me (probably breaks on CVS, not
> sure) which can serve as a basis for supporting this feature in a
> future version.
>
> See Bugzilla:
> http://bugzilla.gnome.org/show_bug.cgi?id=403193
>
> I'm not subscribed to this list, so please 'reply-to-all'.
>
> Regards,
> --
> Matthijs van de Water      | iRex Technologies B.V.
> Embedded Software Engineer | www.irextechnologies.com
> _______________________________________________
> meld-list mailing list
> meld-list gnome org
> http://mail.gnome.org/mailman/listinfo/meld-list
>