GNOME Bugzilla – Bug 403193
Can't resolve subversion conflicts
Last modified: 2009-05-01 09:06:37 UTC
Meld says a file has a conflict even once I've removed the markers in it by hand. Looking at the svn manual here: http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.resolve it says I have to give the command '$ svn resolved sandwich.txt'. Doing this in the terminal worked -- upon refreshing Meld's display, the file was correctly marked as modified. There doesn't seem to be a way to do this from within Meld.
Created attachment 93420 [details] [review] Resolve (SVN) conflicts feature
Created attachment 93421 [details] Icon needed for resolve toolbar button
The attached patch adds an initial 'works for me' version of this feature. I've added a few other VCs than SVN, but only tested it on SVN. The PNG goes into glade2/pixmaps Patch is based on current SVN version of Meld. Any comments more than welcome.
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?
I can do that, though I cannot promise you when. Would you rather not show the button/menu item or make it greyed out?
It should be hidden if it doesn't make sense for a system.
I for one would love to see this functionality in Meld.
Created attachment 133435 [details] [review] rediffed, ported to git master HEAD This is not working the resolved button does not appear in the vcview page, but I can't see why. Could someone have a look a this ? Patch looks obvious, yet it fails to work...
Re: Stephen comment #6 The button will be greyed as any command not immplemented by a VC plugin, so this can and should (imho) be implemented, it does not cost much.
Yes, you're right about greying out. Don't forget to add the button to the ui definition in glade2/vcview-ui.xml to make it appear.
Created attachment 133611 [details] [review] This time it looks like it's working properly: buttons show up
Haven't tested but the patch looks good & clean.
Thanks Matthijs I updated your patch to current meld code and committed. Nice improvement.
I also committed a patch to use your nice picture for the button