213 |
213 |
214 $ sed -i'' -e s/Zwie/Zwei/ main-file-1 |
214 $ sed -i'' -e s/Zwie/Zwei/ main-file-1 |
215 |
215 |
216 and **amend**:: |
216 and **amend**:: |
217 |
217 |
218 $ hg amend --note "fix spelling of Zwei" |
218 $ hg amend |
219 |
219 |
220 The `--note` is our commit message for the *update* only. So its only purpose |
|
221 is to document the evolution of the changeset. If we use `--message` with |
|
222 `amend`, it replaces the commit message of the changeset itself. |
|
223 |
220 |
224 This results in a new single changeset for our amended changeset, and the old |
221 This results in a new single changeset for our amended changeset, and the old |
225 changeset plus the updating changeset are hidden from view by default:: |
222 changeset plus the updating changeset are hidden from view by default:: |
226 |
223 |
227 $ hg log |
224 $ hg log |
239 phase changed for 1 changesets |
236 phase changed for 1 changesets |
240 |
237 |
241 |
238 |
242 (amend of on ancestors) |
239 (amend of on ancestors) |
243 |
240 |
244 $ hg amend --note 'french looks better' |
241 $ hg amend |
245 1 new unstable changesets |
242 1 new unstable changesets |
246 $ hg log |
243 $ hg log |
247 6 feature-A: a nifty feature - test |
244 6 feature-A: a nifty feature - test |
248 4 feature-B: another feature - test |
245 4 feature-B: another feature - test |
249 1 : a nifty feature - test |
246 1 : a nifty feature - test |
250 0 : base - test |
247 0 : base - test |
251 $ hg up -q 0 |
248 $ hg up -q 0 |
252 $ glog --hidden |
249 $ glog --hidden |
253 o 6:23409eba69a0@default(draft) a nifty feature |
250 o 6:23409eba69a0@default(draft) a nifty feature |
254 | |
251 | |
255 | x 5:e416e48b2742@default(draft) french looks better |
252 | x 5:1c85604a32e4@default(draft) amends 568a468b60fc99a42d5d4ddbe181caff1eef308d |
256 | | |
253 | | |
257 | | o 4:f8111a076f09@default(draft) another feature |
254 | | o 4:f8111a076f09@default(draft) another feature |
258 | |/ |
255 | |/ |
259 | | x 3:524e478d4811@default(draft) fix spelling of Zwei |
256 | | x 3:80ebe8e4ea86@default(draft) amends 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 |
260 | | | |
257 | | | |
261 | | x 2:7b36850622b2@default(draft) another feature |
258 | | x 2:7b36850622b2@default(draft) another feature |
262 | |/ |
259 | |/ |
263 | x 1:568a468b60fc@default(draft) a nifty feature |
260 | x 1:568a468b60fc@default(draft) a nifty feature |
264 |/ |
261 |/ |
265 @ 0:e55e0562ee93@default(public) base |
262 @ 0:e55e0562ee93@default(public) base |
266 |
263 |
267 $ hg debugobsolete |
264 $ hg debugobsolete |
268 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
265 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
269 524e478d4811d405c8771e4c441de4483bdf8b33 0 {'date': '* *', 'user': 'test'} (glob) |
266 80ebe8e4ea869802d88c96622bed8ad34aff9d37 0 {'date': '* *', 'user': 'test'} (glob) |
270 568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) |
267 568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) |
271 e416e48b27428695d00c2a2cc4a0b9619482e63f 0 {'date': '* *', 'user': 'test'} (glob) |
268 1c85604a32e4fec7b2d804c6f8cbaf4de9925ee3 0 {'date': '* *', 'user': 'test'} (glob) |
272 $ hg evolve |
269 $ hg evolve |
273 move:[4] another feature |
270 move:[4] another feature |
274 atop:[6] a nifty feature |
271 atop:[6] a nifty feature |
275 merging main-file-1 |
272 merging main-file-1 |
276 $ hg log |
273 $ hg log |