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

Re: Patches to svnmerge

From: Archie Cobbs <archie_at_dellroad.org>
Date: 2005-07-14 18:25:41 CEST

Blair Zajac wrote:
> 1) For bi-directional merges between only two directories, having
> get_default_head filter out the directory it is currently working in is
> useful, as then it'll pick the other directory automatically. Right now
> I always needs to specify -S.

Sounds good.

> 2) In a repository I was working with, I set up svnmerge to take merges
> from a branch back into trunk, so I had to specify the -S command line
> option to 'svnmerge init'. I copied the URL from my browser, so it
> ended up with a trailing /. This caused problems later on, with the
> code not able to find a matching repository local path if you specify a
> local path to -S, because it'll run 'svn info' on the local path and end
> up with a URL without a trailing /.

Also sounds good.

> Finally, have you considered rewriting this in another language that is
> more cross platform friendly, such as Python or Perl? Right now Window
> users need Cygwin to run this script. It would be faster and not as
> hard to do some of the work, such as normalize_list().

I know neither perl nor python, so if that happened I would not
be able to contribute to or maintain the script. But if there is
enough interest from others to do so then I'd be happy handing
over that responsibility.

Patch looks good, please commit if you are ready to.

Also, since you are doing bidirectional merges, etc., I'm interested
in any feedback on the previous commit (which filters out "implicit"
merges of the "svnmerge-integrated" property).


Archie Cobbs * CTO, Awarix * http://www.awarix.com

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 14 18:28:38 2005

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.