91 Collapse changesets: ``amend`` |
91 Collapse changesets: ``amend`` |
92 ------------------------------------------------------------ |
92 ------------------------------------------------------------ |
93 |
93 |
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 Split changesets |
96 Split a changeset |
97 ----------------------- |
97 ----------------------- |
98 |
98 |
99 There is no official command to split a changeset. However is it easily achieved |
99 There is no official command to split a changeset. However is it easily achieved |
100 by manual operation:: |
100 by manual operation:: |
101 |
101 |
151 upstream has applied some of your patches for example. |
151 upstream has applied some of your patches for example. |
152 |
152 |
153 you can use ``hg kill --new <new-changeset> <old-changeset>`` to add obsolete |
153 you can use ``hg kill --new <new-changeset> <old-changeset>`` to add obsolete |
154 marker. |
154 marker. |
155 |
155 |
156 export to mq: ``synchronize`` |
156 Export to mq: ``synchronize`` |
157 ------------------------------------------------------------ |
157 ------------------------------------------------------------ |
158 |
158 |
159 Another extension allows to export |
159 Another extension allows to export. |
160 |
160 |
161 view change to your file |
161 View change to your file |
162 ------------------------------------------------------------ |
162 ------------------------------------------------------------ |
163 |
163 |
164 Another extension allows to export |
164 Another extension allows to export. |
165 |
165 |
166 view diff from the last amend |
166 View diff from the last amend |
167 ------------------------------------------------------------ |
167 ------------------------------------------------------------ |
168 |
168 |
169 an odiff alias have been added by enable.sh |
169 An ``odiff`` alias have been added by ``enable.sh`` |
170 |
170 |
171 :: |
171 :: |
172 [alias] |
172 [alias] |
173 odiff = diff --rev 'limit(obsparents(.),1)' --rev . |
173 odiff = diff --rev 'limit(obsparents(.),1)' --rev . |
174 |
174 |
175 view obsolete marker |
175 View obsolete markers |
176 ------------------------------------------------------------ |
176 ------------------------------------------------------------ |
177 |
177 |
178 hgview is the only viewer that support this feature. you need an experimental |
178 hgview is the only viewer that support this feature. You need an experimental |
179 version available here: |
179 version available here: |
180 |
180 |
181 $ hg clone http://hg-dev.octopoid.net/hgwebdir.cgi/hgview/ |
181 $ hg clone http://hg-dev.octopoid.net/hgwebdir.cgi/hgview/ |
|
182 |
|
183 |
182 |
184 |
183 Important Note |
185 Important Note |
184 ===================================================================== |
186 ===================================================================== |
185 |
187 |
186 view change to your file |
188 View change to your file |
187 ------------------------------------------------------------ |
189 ------------------------------------------------------------ |
188 |
190 |
189 extinct changeset are hidden using the *hidden* feature of mercurial. |
191 Extinct changesets are hidden using the *hidden* feature of mercurial. |
190 |
192 |
191 only hg log and hgview support it. hg glog or other visual viewer don't. |
193 Only ``hg log`` and ``hgview`` support it. ``hg glog`` or other visual viewer don't. |
192 |
194 |
193 |
195 |
194 |
196 |
195 |
197 |
196 |
198 |
197 |
199 |
198 |
200 |
199 |
201 |
200 |
202 |
201 |
203 |