126 combine a changeset with updates and replace it with a new one |
126 combine a changeset with updates and replace it with a new one |
127 |
127 |
128 Commits a new changeset incorporating both the changes to the given files |
128 Commits a new changeset incorporating both the changes to the given files |
129 and all the changes from the current parent changeset into the repository. |
129 and all the changes from the current parent changeset into the repository. |
130 |
130 |
131 See 'hg commit' for details about committing changes. |
131 See "hg commit" for details about committing changes. |
132 |
132 |
133 If you don't specify -m, the parent's message will be reused. |
133 If you don't specify -m, the parent's message will be reused. |
134 |
134 |
135 Behind the scenes, Mercurial first commits the update as a regular child |
135 Behind the scenes, Mercurial first commits the update as a regular child |
136 of the current parent. Then it creates a new commit on the parent's |
136 of the current parent. Then it creates a new commit on the parent's |
137 parents with the updated contents. Then it changes the working copy parent |
137 parents with the updated contents. Then it changes the working copy parent |
138 to this new combined changeset. Finally, the old changeset and its update |
138 to this new combined changeset. Finally, the old changeset and its update |
139 are hidden from 'hg log' (unless you use --hidden with log). |
139 are hidden from "hg log" (unless you use --hidden with log). |
140 |
140 |
141 Returns 0 on success, 1 if nothing changed. |
141 Returns 0 on success, 1 if nothing changed. |
142 |
142 |
143 options ([+] can be repeated): |
143 options ([+] can be repeated): |
144 |
144 |