[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r21142 - branches/1.4.x/subversion/libsvn_ra_serf

From: Justin Erenkrantz <justin_at_erenkrantz.com>
Date: 2006-08-21 18:54:22 CEST

On 8/21/06, Blair Zajac <blair@orcaware.com> wrote:
> It appears that the svnmerge.py script wasn't used to do the merge, as the email
> isn't showing a property diff on the branches/1.4.x directory.
> I know it's a small merge, but can we either fix the merge information in the
> property on branches/1.4.x or revert the merge by hand and then redo the merge
> with svnmerge.py?
> This is really more to get in the habit of using svnmerge.py :)

I'm sorry, but I'm not going to use svnmerge.py anytime soon.
Firstly, I don't have the python bindings installed as I don't have a
recent enough SWIG for Subversion's liking. Secondly, there are no
instructions in HACKING on how to use it that I can find.

IMHO, svnmerge.py should cope gracefully when people can't use it.
That's a critical requirement for any 'merge tracking' tool even when
we roll it out with 1.5: we're not going to be able to force everyone
to update their client to use these new features. -- justin

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Aug 21 19:00:02 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.