Re: [Subclipse-users] svnmerge.py

Eugene Kuleshov <eu@md.pp.ru> wrote on 11/09/2006 10:27:30 PM:

> Mark, can you please explain what are the advantages of using svnmerge

> script or if there are some alternatives that allows to do all the
> merging without switching to command line?

See: http://www.orcaware.com/svn/wiki/Svnmerge.py

> Also, what is the time frame for 1.5 release and would it require any
> server-side support or it is strictly client-side, so it will work with
> old servers like 1.3?

I do not know the answers to either of those. Historically, features have
been made backwards compatible. I know that the current implementation of
the feature requires a custom usage of SQLLite in the repository
(regardless whether you use BDB or fsfs). I think this might just be to
provide good performance of all the property scanning that needs to be
done? Not sure if the feature will then not work if the server does not
have this.

See this among other things:

http://svn.collab.net/repos/svn/branches/merge-tracking/TODO

I know a lot of work has been done, I do not know how much is left. I
imagine once that feature is done the 1.5 process will begin. We have a
lot of improvements in trunk that will help Subclipse so I am hoping it
will come soon, like early next year.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subclipse.tigris.org
For additional commands, e-mail: users-help@subclipse.tigris.org
Received on Fri Nov 10 21:19:42 2006