Differences between revisions 47 and 48
Revision 47 as of 2011-11-21 16:19:41
Size: 1217
Editor: KevinBullock
Comment: Remove dead links, stress that it's now bundled
Revision 48 as of 2012-10-25 20:45:08
Size: 1243
Editor: mpm
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
<<Include(A:historic)>>
<<Include(A:dev)>>
Line 29: Line 32:
CategoryNewFeatures

Note:

This page is no longer relevant but is kept for historical purposes.

Note:

This page is primarily intended for developers of Mercurial.

Rebase Project

Introduction

When contributing to a project, sometimes there is the need to keep some patches private, while keeping the whole repository up-to-date.

In those cases it can be useful to "detach" the local changes, synchronize the repository with the mainstream and then append the private changes on top of the new remote changes. This operation is called rebase.

In general, this extension allows to move revisions from a point to another, some common scenarios are shown in the section "Scenarios".

This feature has been implemented as part of SummerOfCode/2008.

Current implementation

This project is distributed along with Mercurial release 1.1 as RebaseExtension. The original project code can be found here.

Current version's features:

  • rebase both simple and complex cases
  • abort of an interrupted rebasing
  • resume of an interrupted rebasing
  • mq patches handling
  • detect changes during interruptions


RebaseProject (last edited 2012-10-25 20:45:08 by mpm)