[ANN] New extension: mergeutil

[Colin Caughie]

Faced with a large, complicated merge of two divergent branches, I just wrote a simple but IMO very useful extension to help me out with it:

http://bitbucket.org/ccaughie/mergeutil

The most useful thing it does is to label the "local", "other" and "base" revisions for the merge, so that you can easily do comparisons between them. (It does this just by looking at the two parents of the wd and finding their common ancestor, it doesn't look at the per-file information in the mergestate).

For example one thing I often do when merging a file is to compare the "base" and "local" versions, and also the "other" and "current" versions, and then check that the two diffs look roughly similar. With the extension you can do this like:

hg vdiff -r base -r local foo.py
hg vdiff -r other foo.py

You can also do:

hg mergeinfo

to display information about the merge.

Colin


Latest News at: http://www.indigovision.com/news2009.php