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

Using hgmerge with 1.5's interactive conflict resolution

From: Augie Fackler <durin42_at_gmail.com>
Date: 2007-10-25 02:59:40 CEST

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

If anyone has suggestions to improve the Python code, please let me
know - I'm a bit new to doing file operations using Python.

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.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Thu Oct 25 03:00:25 2007

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.