comparison tests/test-topic-flow-publish-bare.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 228caeb8b7af
comparison
equal deleted inserted replaced
3901:f2b8429db565 3914:96945ea908df
114 2 files updated, 0 files merged, 1 files removed, 0 files unresolved 114 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
115 $ hg topic foo 115 $ hg topic foo
116 marked working directory as topic: foo 116 marked working directory as topic: foo
117 $ mkcommit c_dF0 117 $ mkcommit c_dF0
118 active topic 'foo' grew its first changeset 118 active topic 'foo' grew its first changeset
119 (see 'hg help topics' for more information)
119 $ hg push 120 $ hg push
120 pushing to $TESTTMP/bare-branch-server 121 pushing to $TESTTMP/bare-branch-server
121 searching for changes 122 searching for changes
122 adding changesets 123 adding changesets
123 adding manifests 124 adding manifests
147 $ mkcommit c_dG0 148 $ mkcommit c_dG0
148 $ hg topic bar 149 $ hg topic bar
149 marked working directory as topic: bar 150 marked working directory as topic: bar
150 $ mkcommit c_dH0 151 $ mkcommit c_dH0
151 active topic 'bar' grew its first changeset 152 active topic 'bar' grew its first changeset
153 (see 'hg help topics' for more information)
152 $ hg push 154 $ hg push
153 pushing to $TESTTMP/bare-branch-server 155 pushing to $TESTTMP/bare-branch-server
154 searching for changes 156 searching for changes
155 adding changesets 157 adding changesets
156 adding manifests 158 adding manifests