equal
deleted
inserted
replaced
270 $ hg debugobsolete |
270 $ hg debugobsolete |
271 524e478d4811d405c8771e4c441de4483bdf8b33 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
271 524e478d4811d405c8771e4c441de4483bdf8b33 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
272 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
272 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
273 e416e48b27428695d00c2a2cc4a0b9619482e63f 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) |
273 e416e48b27428695d00c2a2cc4a0b9619482e63f 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) |
274 568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) |
274 568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) |
275 $ hg stabilize |
275 $ hg evolve |
276 move:[4] another feature |
276 move:[4] another feature |
277 atop:[6] a nifty feature |
277 atop:[6] a nifty feature |
278 merging main-file-1 |
278 merging main-file-1 |
279 $ hg log |
279 $ hg log |
280 7 feature-B: another feature - test |
280 7 feature-B: another feature - test |
310 |/ |
310 |/ |
311 o 6 feature-A: a nifty feature - test |
311 o 6 feature-A: a nifty feature - test |
312 | |
312 | |
313 o 0 : base - test |
313 o 0 : base - test |
314 |
314 |
315 $ hg stabilize --any --traceback |
315 $ hg evolve --any --traceback |
316 recreate:[8] another feature that rox |
316 recreate:[8] another feature that rox |
317 atop:[7] another feature |
317 atop:[7] another feature |
318 computing new diff |
318 computing new diff |
319 commited as 8d77fa12ab0c |
319 commited as 8d77fa12ab0c |
320 $ hg glog |
320 $ hg glog |