Mercurial > evolve
comparison tests/test-topic-dest.t @ 3914:96945ea908df stable
branching: merge default into stable
The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 31 Jul 2018 12:52:06 +0200 |
| parents | 1bc4b0807c37 |
| children | 537fd9a86c06 ef22eef37ecc |
comparison
equal
deleted
inserted
replaced
| 3901:f2b8429db565 | 3914:96945ea908df |
|---|---|
| 27 | 27 |
| 28 $ echo babar >> jungle | 28 $ echo babar >> jungle |
| 29 $ hg add jungle | 29 $ hg add jungle |
| 30 $ hg ci -t elephant -m babar | 30 $ hg ci -t elephant -m babar |
| 31 active topic 'elephant' grew its first changeset | 31 active topic 'elephant' grew its first changeset |
| 32 (see 'hg help topics' for more information) | |
| 32 | 33 |
| 33 $ hg log -G | 34 $ hg log -G |
| 34 @ 4 (elephant) babar | 35 @ 4 (elephant) babar |
| 35 | | 36 | |
| 36 o 3 () c_delta | 37 o 3 () c_delta |
| 53 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 54 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 54 $ echo zephir >> jungle | 55 $ echo zephir >> jungle |
| 55 $ hg add jungle | 56 $ hg add jungle |
| 56 $ hg ci -t monkey -m zephir | 57 $ hg ci -t monkey -m zephir |
| 57 active topic 'monkey' grew its first changeset | 58 active topic 'monkey' grew its first changeset |
| 59 (see 'hg help topics' for more information) | |
| 58 $ hg log -G | 60 $ hg log -G |
| 59 @ 5 (monkey) zephir | 61 @ 5 (monkey) zephir |
| 60 | | 62 | |
| 61 | o 4 (elephant) babar | 63 | o 4 (elephant) babar |
| 62 | | | 64 | | |