Mercurial > evolve
comparison tests/test-topic-fold.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 | fb4801478d5d |
comparison
equal
deleted
inserted
replaced
| 3901:f2b8429db565 | 3914:96945ea908df |
|---|---|
| 38 $ mkcommit ROOT | 38 $ mkcommit ROOT |
| 39 $ hg topic myfeature | 39 $ hg topic myfeature |
| 40 marked working directory as topic: myfeature | 40 marked working directory as topic: myfeature |
| 41 $ mkcommit feature1 | 41 $ mkcommit feature1 |
| 42 active topic 'myfeature' grew its first changeset | 42 active topic 'myfeature' grew its first changeset |
| 43 (see 'hg help topics' for more information) | |
| 43 $ mkcommit feature2 | 44 $ mkcommit feature2 |
| 44 $ logtopic | 45 $ logtopic |
| 45 @ 2:d76a6166b18c835be9a487c5e21c7d260f0a1676 | 46 @ 2:d76a6166b18c835be9a487c5e21c7d260f0a1676 |
| 46 | topics: myfeature | 47 | topics: myfeature |
| 47 o 1:39e7a938055e87615edf675c24a10997ff05bb06 | 48 o 1:39e7a938055e87615edf675c24a10997ff05bb06 |
| 81 (consider using topic for lightweight branches. See 'hg help topic') | 82 (consider using topic for lightweight branches. See 'hg help topic') |
| 82 $ hg topic myotherfeature | 83 $ hg topic myotherfeature |
| 83 marked working directory as topic: myotherfeature | 84 marked working directory as topic: myotherfeature |
| 84 $ mkcommit feature4 | 85 $ mkcommit feature4 |
| 85 active topic 'myotherfeature' grew its first changeset | 86 active topic 'myotherfeature' grew its first changeset |
| 87 (see 'hg help topics' for more information) | |
| 86 $ logtopic | 88 $ logtopic |
| 87 @ 5:5ded4d6d578c37f339b0716de2e46e12ece7cbde | 89 @ 5:5ded4d6d578c37f339b0716de2e46e12ece7cbde |
| 88 | topics: myotherfeature | 90 | topics: myotherfeature |
| 89 o 4:bdf6950b9b5b7c6b377c8132667c73ec86d5734f | 91 o 4:bdf6950b9b5b7c6b377c8132667c73ec86d5734f |
| 90 | topics: | 92 | topics: |