[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: Blair Zajac <blair_at_orcaware.com>
Date: 2005-07-15 05:13:34 CEST

Archie Cobbs wrote:
> Blair Zajac wrote:
>> 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.

Well, it would be something nice to have, but I don't have time to do it

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

Committed in revision 15340.

> 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).

That patch seems to work fine.

Over all, it works really great. The biggest problem isn't with
svnmerge but with svn sometimes getting conflicts in places you wouldn't
expect conflicts.


Blair Zajac, Ph.D.
Subversion and Orca training and consulting
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Jul 15 05:14:28 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.