diff -r 62f742d144da -r 85cdce113c2c tests/test-topic-rebase.t --- a/tests/test-topic-rebase.t Sat Dec 16 23:40:39 2017 +0100 +++ b/tests/test-topic-rebase.t Tue Jan 16 04:35:34 2018 +0100 @@ -28,7 +28,7 @@ > hg ci -m "add $1" $2 $3 > } $ logtopic() { - > hg log -G -T "{rev}:{node}\ntopics: {topics}" + > hg log -G -T "{rev}:{node}\ntopics: {topic}" > } Check that rebase keep the topic in the simple case (1 changeset, no merge conflict) @@ -101,6 +101,7 @@ $ echo "A" > file $ hg commit -A -m "default2" file created new head + (consider using topic for lightweight branches. See 'hg help topic') Update the common file in a topic $ hg topic myotherfeature