|
Size: 2893
Comment: +(See also [:EditingHistory])
|
Size: 2146
Comment: new layout using included subpages in table
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 28: | Line 28: |
| {{{#!dot digraph { rankdir = BT; node [shape=box]; "working directory" -> R [label="1. update"]; R -> "R+1" -> "R+2"; "R+2" -> "R+k" [style=dashed]; "working directory" -> "R+k" [color=red label="2. revert"]; "working directory" [shape=ellipse]; }}} {{{#!dot digraph { rankdir = BT; node [shape=box]; "working directory" -> "R+k (concatenated)" [color=red label="3. commit"]; "working directory" -> R [style=invis]; R -> "R+k (concatenated)"; R -> "R+1" -> "R+2"; "R+2" -> "R+k" [style=dashed]; "working directory" [shape=ellipse]; }}} {{{#!dot digraph { rankdir = BT; node [shape=box]; "working directory" -> R [style=invis]; "working directory" -> "R+k (concatenated)" [color=red label="4. clone -r tip"] R -> "R+k (concatenated)" "working directory" [shape=ellipse label="cloned working directory"] }}} |
|| [[Include(/fig1)]] || [[Include(/fig2)]] || [[Include(/fig3)]] || ||<:> [:/fig1:fig 1] ||<:> [:/fig2:fig 2] ||<:> [:/fig2:fig 3] || |
Concatenating multiple changesets into one changeset
(See also [:EditingHistory])
Suppose you have a repository with a number of changesets which you want to combine into a single changeset.
This can be done as follows using only the basic operations of mercurial, namely clone, push, pull.
For simplicity, let us assume that the repository in question has a single head, and you want to combine the last k revisions into a single revision.
For concreteness, let us call the base revision R, and the ending revision R+k.
Let us furthermore assume the repository has no local changes.
The strategy is to take advantage of mercurial's support for repositories with more than one head. What we do is create a branch whose root revision is R and which consists of just one changeset (actually it can be multiple changesets, the principle is the same, but for simplicity let us assume one).
Diagramatically, this looks like:
[:/fig1:fig 1] |
[:/fig2:fig 2] |
[:/fig2:fig 3] |
The procedure is as follows.
- hg update R
- This updates the working directory to revision R. Specifically, this means that the contents of the working directory are changed to that of revision R, and that R becomes the parent of the working directory.
- hg revert -r tip --all
- This reverts the working directory to its contents at tip. Since the parent of the working directory is still R, this means that the combined contents of all changesets between R and R+k show up as the modifications in the working directory.
- hg ci -m "Combined changesets between R and R+k"
- At this point, committing these modifications will create a changeset containing all combined changesets between revisions R and R+k.
- hg clone -r tip oldrepo newrepo
- This assumes you want to get rid of your individual changesets (which are a dangling branch in oldrepo) and just keep the combined changeset. newrepo will now just have the combined changeset.