Mercurial > evolve
comparison tests/test-stabilize-result.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 | 121e2d265e85 |
| children | 29abdb2aeccb |
comparison
equal
deleted
inserted
replaced
| 698:b21437d19ea2 | 699:dba3ed9f2c4f |
|---|---|
| 43 | x 1:102a90ea7b4a@default(draft) bk:[] addb | 43 | x 1:102a90ea7b4a@default(draft) bk:[] addb |
| 44 |/ | 44 |/ |
| 45 o 0:07f494440405@default(draft) bk:[] adda | 45 o 0:07f494440405@default(draft) bk:[] adda |
| 46 | 46 |
| 47 $ hg debugobsolete | 47 $ hg debugobsolete |
| 48 41ad4fe8c79565a06c89f032ef0937b3cbd68a04 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob) | |
| 49 102a90ea7b4a3361e4082ed620918c261189a36a 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob) | 48 102a90ea7b4a3361e4082ed620918c261189a36a 1447e1c4828d2347df8f858aa041305fa4cf7db1 0 {'date': '* *', 'user': 'test'} (glob) |
| 49 41ad4fe8c79565a06c89f032ef0937b3cbd68a04 0 {'date': '* *', 'user': 'test'} (glob) | |
| 50 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {'date': '* *', 'user': 'test'} (glob) | 50 cce2c55b896511e0b6e04173c9450ba822ebc740 0 {'date': '* *', 'user': 'test'} (glob) |
| 51 | 51 |
| 52 Test evolve with conflict | 52 Test evolve with conflict |
| 53 | 53 |
| 54 $ ls | 54 $ ls |