Mercurial > evolve

diff tests/test-sharing.t @ 2843:f588de9dd067

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: divergent() is deprecated Use contentdivergent() instead. Match 4dd4757db73a mercurial changeset.
author Boris Feld <boris.feld@octobus.net>
date Fri, 11 Aug 2017 11:30:34 +0200
parents 20c2499ce8bc
children f6517779a7c4
line wrap: on
line diff
--- a/tests/test-sharing.t	Fri Aug 11 11:23:37 2017 +0200
+++ b/tests/test-sharing.t	Fri Aug 11 11:30:34 2017 +0200
@@ -520,7 +520,7 @@
   base: [4] fix bug 24 (v1)
   0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   working directory is now at 5ad6037c046c
-  $ hg log -q -r 'divergent()'
+  $ hg log -q -r 'contentdivergent()'
 
 Figure SG10: Bob's repository after fixing divergence.
   $ hg --hidden shortlog -G -r 3::