Mercurial > evolve
comparison tests/test-evolve-abort-phasediv.t @ 4002:21eab0a99841 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 21 Aug 2018 14:09:33 +0200 |
parents | 537fd9a86c06 684cc3418ecd |
children | 9c025ec4af88 |
comparison
equal
deleted
inserted
replaced
3936:537fd9a86c06 | 4002:21eab0a99841 |
---|---|
94 | 94 |
95 testing that interrupted evolve shows up in morestatus | 95 testing that interrupted evolve shows up in morestatus |
96 $ hg status -v | 96 $ hg status -v |
97 M c | 97 M c |
98 A d | 98 A d |
99 | |
100 $ hg parents | |
101 changeset: 3:ca1b80f7960a | |
102 user: test | |
103 date: Thu Jan 01 00:00:00 1970 +0000 | |
104 summary: added c | |
105 | |
106 changeset: 7:ddba58020bc0 | |
107 tag: tip | |
108 parent: 1:c7586e2a9264 | |
109 user: test | |
110 date: Thu Jan 01 00:00:00 1970 +0000 | |
111 trouble: bumped | |
112 summary: added d | |
113 | |
99 | 114 |
100 $ hg evolve --abort | 115 $ hg evolve --abort |
101 evolve aborted | 116 evolve aborted |
102 working directory is now at ddba58020bc0 | 117 working directory is now at ddba58020bc0 |
103 | 118 |