Mercurial > evolve
comparison tests/test-minitopic.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 | d171815d2618 |
comparison
equal
deleted
inserted
replaced
| 3901:f2b8429db565 | 3914:96945ea908df |
|---|---|
| 145 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 145 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 146 $ hg topic topic_A | 146 $ hg topic topic_A |
| 147 marked working directory as topic: topic_A | 147 marked working directory as topic: topic_A |
| 148 $ mkcommit c_E0 | 148 $ mkcommit c_E0 |
| 149 active topic 'topic_A' grew its first changeset | 149 active topic 'topic_A' grew its first changeset |
| 150 (see 'hg help topics' for more information) | |
| 150 $ hg push disabled | 151 $ hg push disabled |
| 151 pushing to http://localhost:$HGPORT2/ | 152 pushing to http://localhost:$HGPORT2/ |
| 152 searching for changes | 153 searching for changes |
| 153 abort: push creates new remote head f31af349535e! | 154 abort: push creates new remote head f31af349535e! |
| 154 (merge or see 'hg help push' for details about pushing new heads) | 155 (merge or see 'hg help push' for details about pushing new heads) |