Mercurial > evolve

diff tests/test-evolve-content-divergent-user-independent-resolution.t @ 6123:5e14782908e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update for obsolescence-aware head computation in core CORE-TEST-OUTPUT-UPDATE: f8f2ecdde4b5 CORE-TEST-OUTPUT-UPDATE: 053a5bf508da
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 27 Dec 2021 18:40:04 +0300
parents aca07ac01167
children bd2c42680dff
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-user-independent-resolution.t	Wed Feb 02 14:54:30 2022 +0300
+++ b/tests/test-evolve-content-divergent-user-independent-resolution.t	Mon Dec 27 18:40:04 2021 +0300
@@ -35,7 +35,7 @@
   $ hg push -q
 
   $ cd ../local
-  $ hg push -q
+  $ hg push --force -q
   2 new content-divergent changesets
   $ hg pull -q
   2 new content-divergent changesets