> BTW, *how* do I use the experimental.topic.linear-merge feature?
It seems not to work. As I said I use hg 5.2, and evolve based on changeset 3f9ef377e670 which is installed as 10.10 Then I have [experimental] experimental.topic.linear-merge = True And run hg init echo "First" > test.org hg add test.org hg commit -u "Bernhard Riemann <bernhard.riem...@gmail.com>" -m "First" echo "Second" >> test.org hg commit -u "Bernhard Riemann <bernhard.riem...@gmail.com>" -m "Second" echo "Third" >> test.org hg commit -u "Bernhard Riemann <bernhard.riem...@gmail.com>" -m "Third" echo "Forth" >> test.org hg commit -m "Fourth" hg topics NewTopic echo "Fifth" >> test.org hg commit -m "Fifth" echo "Six" >> test.org hg commit -m "Six" hg up 3 hg merge NewTopic But I receive abort: nothing to merge What do I miss regards _______________________________________________ Mercurial mailing list Mercurial@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial
