comparison tests/test-topic-flow-single-head.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 62b60fc1983d
comparison
equal deleted inserted replaced
3901:f2b8429db565 3914:96945ea908df
98 98
99 $ hg topic foo 99 $ hg topic foo
100 marked working directory as topic: foo 100 marked working directory as topic: foo
101 $ mkcommit c_dF0 101 $ mkcommit c_dF0
102 active topic 'foo' grew its first changeset 102 active topic 'foo' grew its first changeset
103 (see 'hg help topics' for more information)
103 $ hg push 104 $ hg push
104 pushing to $TESTTMP/single-head-server 105 pushing to $TESTTMP/single-head-server
105 searching for changes 106 searching for changes
106 adding changesets 107 adding changesets
107 adding manifests 108 adding manifests
114 0 files updated, 0 files merged, 3 files removed, 0 files unresolved 115 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
115 $ hg topic bar 116 $ hg topic bar
116 marked working directory as topic: bar 117 marked working directory as topic: bar
117 $ mkcommit c_dG0 118 $ mkcommit c_dG0
118 active topic 'bar' grew its first changeset 119 active topic 'bar' grew its first changeset
120 (see 'hg help topics' for more information)
119 $ hg push 121 $ hg push
120 pushing to $TESTTMP/single-head-server 122 pushing to $TESTTMP/single-head-server
121 searching for changes 123 searching for changes
122 adding changesets 124 adding changesets
123 adding manifests 125 adding manifests