Mercurial > evolve
comparison tests/test-evolve.t @ 699:dba3ed9f2c4f stable
amend: prune replacement commit without sucessors
This align with the core behavior of `commit --amend`.
All user of rewrite are not responsible for creating their own marker.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Fri, 08 Feb 2013 21:43:00 +0000 |
| parents | 7daf42959b72 |
| children | b5a85a8909d3 |
comparison
equal
deleted
inserted
replaced
| 698:b21437d19ea2 | 699:dba3ed9f2c4f |
|---|---|
| 263 | x 1:568a468b60fc@default(draft) a nifty feature | 263 | x 1:568a468b60fc@default(draft) a nifty feature |
| 264 |/ | 264 |/ |
| 265 @ 0:e55e0562ee93@default(public) base | 265 @ 0:e55e0562ee93@default(public) base |
| 266 | 266 |
| 267 $ hg debugobsolete | 267 $ hg debugobsolete |
| 268 524e478d4811d405c8771e4c441de4483bdf8b33 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) | |
| 269 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) | 268 7b36850622b2fd159fa30a4fb2a1edd2043b4a14 f8111a076f0975cbecb336e2bd3411be22b673fb 0 {'date': '* *', 'user': 'test'} (glob) |
| 270 e416e48b27428695d00c2a2cc4a0b9619482e63f 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) | 269 524e478d4811d405c8771e4c441de4483bdf8b33 0 {'date': '* *', 'user': 'test'} (glob) |
| 271 568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) | 270 568a468b60fc99a42d5d4ddbe181caff1eef308d 23409eba69a0986e90cd42252852c1e6da97af5b 0 {'date': '* *', 'user': 'test'} (glob) |
| 271 e416e48b27428695d00c2a2cc4a0b9619482e63f 0 {'date': '* *', 'user': 'test'} (glob) | |
| 272 $ hg evolve | 272 $ hg evolve |
| 273 move:[4] another feature | 273 move:[4] another feature |
| 274 atop:[6] a nifty feature | 274 atop:[6] a nifty feature |
| 275 merging main-file-1 | 275 merging main-file-1 |
| 276 $ hg log | 276 $ hg log |