Mercurial > hg

diff tests/test-transaction-wc-rollback-race.t @ 50174:596a6b9b0570

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable into default This show that the recent changes on default fixed the issue with transaction overwriting content in `test-transaction-wc-rollback-race.t`
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 22 Feb 2023 18:42:09 +0100
parents bf27727e6c78
children
line wrap: on
line diff
--- a/tests/test-transaction-wc-rollback-race.t	Wed Feb 22 18:10:26 2023 +0100
+++ b/tests/test-transaction-wc-rollback-race.t	Wed Feb 22 18:42:09 2023 +0100
@@ -134,8 +134,6 @@
   $ hg phase --rev 0
   0: draft
   $ cat ../log.err
-  transaction abort!
-  rollback completed
   abort: pretxnclose.test hook exited with status 1
 
 Actual testing
@@ -153,7 +151,7 @@
   $ touch $TESTTMP/transaction-continue
   $ wait
   $ hg status
-  R default_a (missing-correct-output !)
+  R default_a
   $ hg revert --all --quiet
 
 Changing branch from default
@@ -204,10 +202,8 @@
   $ touch $TESTTMP/transaction-continue
   $ wait
   $ hg log --rev . -T '{desc}\n'
-  babar_l (missing-correct-output !)
-  babar_m (known-bad-output !)
+  babar_l
   $ hg st
-  ! babar_m (known-bad-output !)
 
   $ hg purge --no-confirm
   $ hg up --quiet babar