Mercurial > evolve
comparison tests/test-tutorial.t @ 466:b98490b689a5
stabilize: handle killed changeset in stabilize.
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Mon, 20 Aug 2012 14:40:48 +0200 |
| parents | d702f0d26c6a |
| children | 2111c655b4f5 |
comparison
equal
deleted
inserted
replaced
| 465:4a039a8c1cf3 | 466:b98490b689a5 |
|---|---|
| 739 | 739 |
| 740 | 740 |
| 741 $ hg log -r 'unstable()' | 741 $ hg log -r 'unstable()' |
| 742 ae45c0c3092a (draft): SPAM SPAM SPAM | 742 ae45c0c3092a (draft): SPAM SPAM SPAM |
| 743 | 743 |
| 744 # XXX make prune stabilization works | 744 $ hg stabilize --any |
| 745 # $ hg stabilize --any | 745 move:[17] SPAM SPAM SPAM |
| 746 # merging shopping | 746 atop:[14] bathroom stuff |
| 747 | |
| 748 $ hg graft -O ae45c0c3092a | |
| 749 grafting revision 17 | |
| 750 merging shopping | 747 merging shopping |
| 751 | 748 |
| 752 $ hg log -G | 749 $ hg log -G |
| 753 @ 20de1fb1cec5 (draft): SPAM SPAM SPAM | 750 @ d6717f710962 (draft): SPAM SPAM SPAM |
| 754 | | 751 | |
| 755 o ffa278c50818 (draft): bathroom stuff | 752 o ffa278c50818 (draft): bathroom stuff |
| 756 | | 753 | |
| 757 o a2fccc2e7b08 (public): SPAM SPAM | 754 o a2fccc2e7b08 (public): SPAM SPAM |
| 758 | | 755 | |