diff -r 32f15b361f36 -r fab9dda0f2a3 tests/test-obsolete-divergent.t --- a/tests/test-obsolete-divergent.t Tue Oct 14 13:27:00 2014 -0700 +++ b/tests/test-obsolete-divergent.t Tue Oct 14 13:34:25 2014 -0700 @@ -5,15 +5,11 @@ Enable obsolete - $ cat > obs.py << EOF - > import mercurial.obsolete - > mercurial.obsolete._enabled = True - > EOF $ cat >> $HGRCPATH << EOF > [ui] > logtemplate = {rev}:{node|short} {desc}\n - > [extensions] - > obs=${TESTTMP}/obs.py + > [experimental] + > evolution=createmarkers > [alias] > debugobsolete = debugobsolete -d '0 0' > [phases]