Differences between revisions 3 and 4
⇤ ← Revision 3 as of 2010-01-20 10:27:02 →
Size: 881
Editor: abuehl
Comment: +category
← Revision 4 as of 2012-04-24 21:14:08 → ⇥
Size: 877
Editor: ks3095497
Comment: Make the page work with the all-extensions scrapping tool
Deletions are marked like this. Additions are marked like this.
Line 7: Line 7:
Repository: [[http://bitbucket.org/ccaughie/mergeutil]] Repository: http://bitbucket.org/ccaughie/mergeutil

MergeUtil Extension

This extension is not distributed with Mercurial.

Author: Colin Caughie <c.caughie@indigovision.com>

Repository: http://bitbucket.org/ccaughie/mergeutil

Overview

This extension provides utilities that can be useful when merging two branches in a Mercurial repository. In particular, when a merge is in progress (i.e. the current working directory has two parents) it defines shortcuts to the three most important historical revisions:

  • local: The parent on the local branch
  • other: The parent on the other branch
  • base: The common ancestor of local and other

This lets you do things like:: 

$ hg diff -r other foo.py
$ hg diff -r base -r local foo.py

It also provides the mergeinfo command, which displays useful information about the ongoing merge.

CategoryExtensionsByOthers

MergeUtilExtension (last edited 2012-04-24 21:14:08 by ks3095497)