Re: [Inkscape-devel] merge the filters?

On Tue, 2006-06-20 at 17:16 -0500, Aaron Spike wrote:

Shall we merge the filters branch into trunk? I've never done this before, but I suspect that it works something like this. Inside of a working copy of trunk type:

svn merge -r 12093:HEAD https://svn.sourceforge.net/svnroot/inkscape/inkscape/branches/svg-filters

and then commit after fixing any conflicts. Does taht sound about right? Should this happen now-ish?

The only thing that makes me a little nervous about this is that part of the requirements from Google is that the code they work on gets submitted to Google. Google has agreed to take patches. So, I think working on a branch makes that much easier.

--Ted