|
Size: 4861
Comment:
|
Size: 4014
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 55: | Line 55: |
| } }}} == Rebasing merged revisions == This is a common situation, in which we have cloned a repository and then merged with it. {{{#!dot digraph { rankdir=LR; center=true; node [shape=box]; C1 -> C2 -> R1 -> R2; C1 -> L1 -> L2; C2 -> L2; } }}} In this case the expected result of rebasing L2 on top of R2 is: {{{#!dot digraph { rankdir=LR; center=true; node [shape=box]; C1 -> C2 -> R1 -> R2; C1 -> L1; node [color=red]; R2 -> L2; L2 [label="L2`"]; } }}} But if we tried to rebase starting from L1, then ''rebase'' would recognize that L2 is an empty revision and it would skip it. {{{#!dot digraph G { rankdir=LR; center=true; node [shape=box]; C1 -> C2 -> R1 -> R2; node [color=red]; R2 -> L1; L1 [label="L1`"]; |
|
| Line 206: | Line 160: |
| In this case the revision H has been skipped, because it would have been an empty revision. | In this case the revision H has been '''skipped''', because it would have been an empty revision. |
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.
This feature is being implemented as part of SummerOfCode.
Current implementation
The current code can be find [http://freehg.org/u/astratto/soc/ here]
Current version's features:
- rebase both simple and complex cases
- abort of an interrupted rebasing
- resume of an interrupted rebasing
- mq patches handling
Usage examples
Let suppose we have the following repository
where C* are common revisions, R* changes in upstream and L* local changes.
Simple case
We want to rebase L* on top of R2.
This can be achieved using:
$ hg rebase L1 R2
Result:
Dealing with conflicting merges
Sometimes could happen that some changes in L* conflicts with some changes in R*. In these cases the extension will stop, store the current status and let user the ability to solve the conflict on his own.
In event of interruption users have two choices:
- abort
- continue
Abort
An interrupted process can be aborted, thus restoring the repository to its original state, with:
$ hg rebase --abort
Continue
The most common situation, however, is resuming an interrupted process and this can be done with:
$ hg rebase --continue
Scenarios
Now will be analyzed the most interesting scenarios.
Scenario A
The first one is the simplest one, a simple branch.
In this scenario there are two interesting interactions:
- rebase on top
- rebase on an intermediate revision
Scenario B
The second scenario involves something more complicated. In this scenario the user cloned from upstream, then merged several times.
- rebase G on I
In this case the revision H has been skipped, because it would have been an empty revision.
- rebase D on I
- Despite being a merge revision D hasn't been skipped in this case.
- rebase B on I
Related links
[http://code.google.com/soc/2008/hg/appinfo.html?csaid=EC7D811E53CA98EF GSoC's Abstract ]