Mercurial > evolve
comparison tests/test-stabilize-result.t @ 4074:eb4d07a0b19f mercurial-4.6
test-compat: merge stable into mercurial-4.6
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 Sep 2018 21:59:24 +0200 |
| parents | f7afd3a158e3 ecbf61d90807 |
| children | f9a850018daa 4a740f9eee49 |
comparison
equal
deleted
inserted
replaced
| 4030:9871809aa348 | 4074:eb4d07a0b19f |
|---|---|
| 126 $ hg commit -m 'add c' | 126 $ hg commit -m 'add c' |
| 127 created new head | 127 created new head |
| 128 | 128 |
| 129 Get a successors of 8 on it | 129 Get a successors of 8 on it |
| 130 | 130 |
| 131 $ hg grab 1cf0aacfd363 | 131 $ hg pick 1cf0aacfd363 |
| 132 grabbing 6:1cf0aacfd363 "newer a" | 132 picking 6:1cf0aacfd363 "newer a" |
| 133 | 133 |
| 134 Add real change to the successors | 134 Add real change to the successors |
| 135 | 135 |
| 136 $ echo 'babar' >> a | 136 $ echo 'babar' >> a |
| 137 $ hg amend | 137 $ hg amend |