# HG changeset patch # User Pierre-Yves David # Date 1540464789 -7200 # Node ID f21a9aac3addc05a5957fd42bfe9e105c1eab380 # Parent 4803bfe8db173c20978b3be9b2a48f71a5838faa test-compat: backed out changeset 7091f7215651 Preparing the branch for 4.8. diff -r 4803bfe8db17 -r f21a9aac3add tests/test-evolve.t --- a/tests/test-evolve.t Thu Oct 25 12:52:34 2018 +0200 +++ b/tests/test-evolve.t Thu Oct 25 12:53:09 2018 +0200 @@ -380,8 +380,8 @@ $ hg up -r "desc('a nifty feature')" 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg revert -r "desc('another feature')" --all + reverting main-file-1 adding file-from-B - reverting main-file-1 $ sed -i'' -e s/Zwei/deux/ main-file-1 $ hg commit -m 'another feature that rox' -o 5 created new head