Differences between revisions 4 and 6 (spanning 2 versions)
Revision 4 as of 2010-11-29 19:29:27
Size: 1474
Comment:
Revision 6 as of 2010-11-29 21:33:01
Size: 1550
Comment:
Deletions are marked like this. Additions are marked like this.
Line 10: Line 10:
'''This extension is/is not distributed with Mercurial.''' '''This extension is not distributed with Mercurial.'''
Line 14: Line 14:
Download site: https://bitbucket.org/marcusl/ml-hgext/src/tip/rebaseif.py

Issue tracker: https://bitbucket.org/marcusl/ml-hgext/issues
 * Download site: https://bitbucket.org/marcusl/ml-hgext/src/tip/rebaseif.py
 * Issue tracker: https://bitbucket.org/marcusl/ml-hgext/issues
 * If you like it, drop a note here: https://www.ohloh.net/p/ml-hgext
Line 25: Line 25:

RebaseIfExtension

This extension builds on the RebaseExtension but adds some simple logic that chooses a merge instead of a rebase if there are conflicts.

1. Status

This extension is not distributed with Mercurial.

Author: MarcusLindblom

2. Overview

The extension provides both a new command rebaseif as well as a new option to pull --rebaseif that invoke the rebaseif procedure after pulling. (Similar to RebaseExtension 's --rebase option).

This is useful since manual merges are error prone and a merge commit more clearly expresses each side of the merge, and the merge resolution choices, than a rebase (which tends to bundle all the local changes and the merge ops together and giving little chance of a rollback.)

The background for this is described in this StackOverflow question.

3. Configuration

Configure your .hgrc to enable the extension by adding following lines:

[extensions]
rebaseif = path/to/rebaseif.py

4. Usage

> hg rebaseif

> hg pull --rebaseif

5. See also


CategoryExtensionsByOthers

RebaseIfExtension (last edited 2012-02-15 22:36:20 by ks3095497)