equal
deleted
inserted
replaced
94 you can use amend -c to collapse multiple changeset in a single one. |
94 you can use amend -c to collapse multiple changeset in a single one. |
95 |
95 |
96 Getting changes out of a commit |
96 Getting changes out of a commit |
97 ------------------------------------------------------------ |
97 ------------------------------------------------------------ |
98 |
98 |
99 the ``hg uncommit`` commands allow you to rewrite the current commit to not |
99 The ``hg uncommit`` command lets you rewrite the parent commit without |
100 include change for some file. The content of target files are not altered on |
100 selected changed files. Target files content is not altered and |
101 disk and back as "modified":: |
101 appears again as "modified":: |
102 |
102 |
103 $ hg st |
103 $ hg st |
104 M babar |
104 M babar |
105 M celestine |
105 M celestine |
106 $ hg commit babar celestine |
106 $ hg commit babar celestine |
110 M celestine |
110 M celestine |
111 |
111 |
112 Split a changeset |
112 Split a changeset |
113 ----------------------- |
113 ----------------------- |
114 |
114 |
115 I you just want to split whole file, you can just use the ``uncommit`` command. |
115 To split on file boundaries, just use ``uncommit`` command. |
116 |
116 |
117 |
117 There is no official command yet to split at a finer granularity. One |
118 If you need fine grained split, there is no official command for that yet. |
118 way to achieve this is:: |
119 However is it easily achieved by manual operation:: |
|
120 |
119 |
121 ### you want to split changeset A: 42 |
120 ### you want to split changeset A: 42 |
122 # update to A parent |
121 # update to A parent |
123 $ hg up 42^ |
122 $ hg up 42^ |
124 # restore content from A |
123 # restore content from A |
186 marker. |
185 marker. |
187 |
186 |
188 Export to mq: ``synchronize`` |
187 Export to mq: ``synchronize`` |
189 ------------------------------------------------------------ |
188 ------------------------------------------------------------ |
190 |
189 |
191 Another extension allows to export. you changes to mq |
190 Another extension lets you export your changes to mq. |
192 |
191 |
193 View diff from the last amend |
192 View diff from the last amend |
194 ------------------------------------------------------------ |
193 ------------------------------------------------------------ |
195 |
194 |
196 An ``odiff`` alias have been added by ``enable.sh`` |
195 An ``odiff`` alias have been added by ``enable.sh`` |
221 View change to your file |
220 View change to your file |
222 ------------------------------------------------------------ |
221 ------------------------------------------------------------ |
223 |
222 |
224 Extinct changesets are hidden using the *hidden* feature of mercurial. |
223 Extinct changesets are hidden using the *hidden* feature of mercurial. |
225 |
224 |
226 Only ``hg log`` and ``hgview`` support it. ``hg glog`` Only support that since |
225 Only ``hg log``, ``hg glog`` and ``hgview`` support it, other |
227 2.2. Other visual viewer don't. |
226 graphical viewer do not. |
228 |
227 |
229 |
228 |
230 |
229 |
231 |
230 |
232 |
231 |
233 |
232 |
234 |
233 |
235 |
234 |
236 |
235 |
237 |
236 |