|
Size: 2857
Comment: +CategoryTipsAndTricks
|
Size: 2855
Comment: rm imprecise sentence, use "changeset" instead of "revision"
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| == Concatenating multiple changesets into one changeset == | == Concatenating multiple changesets into one == |
| Line 3: | Line 3: |
| Suppose you have a repository with a number of changesets which you want to combine into a single changeset. |
''(See also [:EditingHistory])'' |
| Line 6: | Line 5: |
| This can be done as follows using only the basic operations of mercurial, namely clone, push, pull. |
Suppose you have a [:Repository:repository] with a number of [:ChangeSet:changesets] which you want to combine into a single changeset. Let's make the following assumptions: |
| Line 9: | Line 8: |
| 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. |
* The repository in question has a single [:Head:head], and you want to combine the last k changesets into a single changeset. * The base changeset is called R, and the ending changeset is called R+k. * The repository has no [:LocalModifications:local modifications]. |
| Line 13: | Line 12: |
| For concreteness, let us call the base revision R, and the ending revision R+k. |
What we do is create a [:Branch:branch] whose root changeset is R and which consists of one[[FootNote(Actually it can be multiple changesets. The principle is the same, but for simplicity let us assume one.)]] changeset (result of step 3 below). The procedure is as follows: |
| Line 16: | Line 14: |
| Let us furthermore assume the repository has no local changes. | '''~+{{{1: hg update R}}}+~''' |
| Line 18: | Line 16: |
| 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). |
This [:Update:updates] the [:WorkingDirectory: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:parent] of the working directory. |
| Line 24: | Line 21: |
| Diagramatically, this looks like: | |
| Line 26: | Line 22: |
| {{{#!dot | '''~+{{{2: hg revert -r tip --all}}}+~''' {{{#!dot |
| Line 28: | Line 26: |
| rankdir = BT; | rankdir = LR; |
| Line 37: | Line 35: |
| {{{#!dot | This [:Revert:reverts] the working directory to its contents at [:Tip: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. '''~+{{{3: hg ci -m "Combined changesets between R and R+k"}}}+~''' {{{#!dot |
| Line 39: | Line 45: |
| rankdir = BT; | rankdir = LR; |
| Line 49: | Line 55: |
| {{{#!dot | At this point, [:Commit:committing] these modifications will create a changeset containing all combined changesets between revisions R and R+k. '''~+{{{4: hg clone -r tip oldrepo newrepo}}}+~''' {{{#!dot |
| Line 51: | Line 63: |
| rankdir = BT; | rankdir = LR; |
| Line 59: | Line 71: |
| This assumes you want to get rid of your individual changesets (which are a dangling branch in oldrepo) and just keep the combined changeset (see also [:PruningDeadBranches]). newrepo will now just have the combined changeset. | |
| Line 60: | Line 73: |
| The procedure is as follows. 1. 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. 2. 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. 3. 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. 4. 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. |
Concatenating multiple changesets into one
(See also [:EditingHistory])
Suppose you have a [:Repository:repository] with a number of [:ChangeSet:changesets] which you want to combine into a single changeset. Let's make the following assumptions:
The repository in question has a single [:Head:head], and you want to combine the last k changesets into a single changeset.
- The base changeset is called R, and the ending changeset is called R+k.
The repository has no [:LocalModifications:local modifications].
What we do is create a [:Branch:branch] whose root changeset is R and which consists of oneFootNote(Actually it can be multiple changesets. The principle is the same, but for simplicity let us assume one.) changeset (result of step 3 below). The procedure is as follows:
1: hg update R
This [:Update:updates] the [:WorkingDirectory: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:parent] of the working directory.
2: hg revert -r tip --all
This [:Revert:reverts] the working directory to its contents at [:Tip: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.
3: hg ci -m "Combined changesets between R and R+k"
At this point, [:Commit:committing] these modifications will create a changeset containing all combined changesets between revisions R and R+k.
4: 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 (see also [:PruningDeadBranches]). newrepo will now just have the combined changeset.