diff -r bf07c19b4c82 -r aa4a1672583e tests/test-convert-filemap.t --- a/tests/test-convert-filemap.t Mon Jan 12 18:01:20 2015 -0700 +++ b/tests/test-convert-filemap.t Fri Jan 09 10:52:14 2015 -0800 @@ -637,7 +637,7 @@ $ cd namedbranch $ hg --config extensions.mq= strip tip 1 files updated, 0 files merged, 0 files removed, 0 files unresolved - saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-backup.hg (glob) + saved backup bundle to $TESTTMP/namedbranch/.hg/strip-backup/73899bcbe45c-92adf160-backup.hg (glob) $ hg up foo 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge default