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

Re: Using hgmerge with 1.5's interactive conflict resolution

From: Karl Fogel <kfogel_at_red-bean.com>
Date: 2007-11-28 00:09:23 CET

Augie Fackler <durin42@gmail.com> writes:
> I submitted this a while ago, but all that came of it was discussing
> the interface to the external merge tool. Does it make sense to
> include this script in contrib, or should I just publish it on my own
> hosting for now?

Could you point to the original message in the archives, please?
Thanks.

> (wanted to nudge this before 1.5 goes final)

No need to worry; contrib scripts can be added after branching.

-Karl

> On Oct 24, 2007, at 8:59 PM, Augie Fackler wrote:
>
>> Hey all,
>>
>> In using Mercurial I noticed that hgmerge pretty much rocks across
>> platforms for doing interactive merges, but the arguments it takes
>> are somewhat different than ours. As such, I made a python wrapper
>> for the hgmerge script, which is attached.
>>
>> I thought it should go in the contrib area so that people other than
>> me will use it, since it's pretty handy. The the only major quirk as
>> of now is that FileMerge on OS X doesn't seem to like writing to a
>> tempfile that is a sibling of the conflicted file. I tried to
>> diagnose that and in the end gave up and just used a temporary
>> directory.
>>
>> If anyone has suggestions to improve the Python code, please let me
>> know - I'm a bit new to doing file operations using Python.
>>
>> Peace,
>> Augie Fackler
>> [[[
>> Add svn_hgmerge.py which wraps Mercurial's hgmerge script for use
>> with the
>> interactive conflict resolution system.
>>
>> * contrib/client-side/svn_hgmerge.py
>> New file.
>> ]]]
>> <svn_hgmerge.py>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Nov 28 00:09:38 2007

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