|
Size: 1349
Comment: was already included in RebaseExtension
|
Size: 1217
Comment: Remove dead links, stress that it's now bundled
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 12: | Line 12: |
| The current code can be found [[http://www.bitbucket.org/astratto/rebase-soc/|here]] and [[http://www.selenic.com/hg/index.cgi/file/73268e317ad3/hgext/rebase.py#l1|here]] ([[http://freehg.org/u/astratto/soc/|old repository]]). This project is distributed along with Mercurial release 1.1 as RebaseExtension. | This project is distributed along with Mercurial release 1.1 as RebaseExtension. The original project code can be found [[http://www.bitbucket.org/astratto/rebase-soc/|here]]. |
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