|
Size: 2828
Comment: moved from TipsAndTricks/Advanced
|
Size: 3110
Comment: get rid of subpage inclusion by using LR orientation
|
| Deletions are marked like this. | Additions are marked like this. |
| 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])'' Suppose you have a [:Repository:repository] with a number of [:ChangeSet:changesets] which you want to combine into a single changeset. |
| Line 7: | Line 9: |
| mercurial, namely clone, push, pull. | Mercurial, namely [:Clone:clone], [:Push:push], and [:Pull:pull]. |
| Line 10: | Line 12: |
| single head, and you want to combine the last k revisions into a single revision. |
single [:Head:head], and you want to combine the last k [:Revision:revisions] into a single revision. |
| Line 16: | Line 18: |
| Let us furthermore assume the repository has no local changes. | Let us furthermore assume the repository has no [:LocalModifications:local modifications]. |
| Line 18: | Line 20: |
| The strategy is to take advantage of mercurial's support for repositories with more than one head. What we do is create a branch |
The strategy is to take advantage of Mercurial's support for repositories with more than one head. What we do is create a [:Branch:branch] |
| Line 24: | Line 26: |
| Diagramatically, this looks like: | The procedure is as follows: |
| Line 26: | Line 28: |
| {{{#!dot | '''~+{{{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}}}+~''' {{{#!dot |
| Line 28: | Line 40: |
| rankdir = BT; | rankdir = LR; |
| Line 37: | Line 49: |
| {{{#!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 59: |
| rankdir = BT; | rankdir = LR; |
| Line 49: | Line 69: |
| {{{#!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 77: |
| rankdir = BT; | rankdir = LR; |
| Line 59: | Line 85: |
| 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 87: |
| 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. |
---- CategoryTipsAndTricks |
Concatenating multiple changesets into one changeset
(See also [:EditingHistory])
Suppose you have a [:Repository:repository] with a number of [:ChangeSet: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:clone], [:Push:push], and [:Pull:pull].
For simplicity, let us assume that the repository in question has a single [:Head:head], and you want to combine the last k [:Revision: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 [:LocalModifications:local modifications].
The strategy is to take advantage of Mercurial's support for repositories with more than one head. What we do is create a [:Branch: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).
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.