Mercurial > evolve
diff tests/test-topic-change.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 | d00f0c369bc7 d5a2cc19903f |
line wrap: on
line diff
--- a/tests/test-topic-change.t Wed Jul 25 15:30:37 2018 -0700 +++ b/tests/test-topic-change.t Tue Jul 31 12:52:06 2018 +0200 @@ -138,6 +138,7 @@ $ hg topic foobar $ hg topic -r . --current active topic 'foobar' grew its first changeset + (see 'hg help topics' for more information) changed topic on 1 changes $ hg glog -r . @ 20:c2d6b7df5dcf {foobar} @@ -223,6 +224,7 @@ $ hg topic wat $ hg ci --amend active topic 'wat' grew its first changeset + (see 'hg help topics' for more information) $ hg glog -r . @ 28:61470c956807 {wat} | Added h () @@ -243,6 +245,7 @@ marked working directory as topic: watwat $ hg ci --amend active topic 'watwat' grew its first changeset + (see 'hg help topics' for more information) $ hg glog -r . @ 30:a24c31c35013 {watwat} | Added h ()