Mercurial > hg
diff tests/test-obsolete-divergent.t @ 33775:f078d7358e90
revset: remane divergent into contentdivergent
Don't touch divergent volatile set name, only the revset name. The volatile
set name will be updated in a later patch.
The renaming is done according to
https://www.mercurial-scm.org/wiki/CEDVocabulary.
Differential Revision: https://phab.mercurial-scm.org/D251
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Thu, 03 Aug 2017 14:01:51 +0200 |
parents | 6c1a9fd8361b |
children | ecc96506c49d |
line wrap: on
line diff
--- a/tests/test-obsolete-divergent.t Thu Aug 03 13:48:39 2017 +0200 +++ b/tests/test-obsolete-divergent.t Thu Aug 03 14:01:51 2017 +0200 @@ -80,7 +80,7 @@ 82623d38b9ba 392fd25390da 392fd25390da - $ hg log -r 'divergent()' + $ hg log -r 'contentdivergent()' 2:82623d38b9ba A_1 3:392fd25390da A_2 $ hg debugsuccessorssets 'all()' --closest @@ -147,7 +147,7 @@ 01f36c5a8fda 01f36c5a8fda 01f36c5a8fda - $ hg log -r 'divergent()' + $ hg log -r 'contentdivergent()' 2:82623d38b9ba A_1 4:01f36c5a8fda A_3 $ hg debugsuccessorssets 'all()' --closest @@ -199,7 +199,7 @@ 82623d38b9ba 392fd25390da 392fd25390da - $ hg log -r 'divergent()' + $ hg log -r 'contentdivergent()' 2:82623d38b9ba A_1 3:392fd25390da A_2 $ hg debugsuccessorssets 'all()' --closest @@ -278,7 +278,7 @@ 01f36c5a8fda 01f36c5a8fda 01f36c5a8fda - $ hg log -r 'divergent()' + $ hg log -r 'contentdivergent()' $ hg debugsuccessorssets 'all()' --closest d20a80d4def3 d20a80d4def3 @@ -322,7 +322,7 @@ 82623d38b9ba 392fd25390da 392fd25390da - $ hg log -r 'divergent()' + $ hg log -r 'contentdivergent()' $ hg debugsuccessorssets 'all()' --closest d20a80d4def3 d20a80d4def3 @@ -410,7 +410,7 @@ e442cfc57690 e442cfc57690 e442cfc57690 - $ hg log -r 'divergent()' + $ hg log -r 'contentdivergent()' Check more complex obsolescence graft (with divergence) @@ -515,7 +515,7 @@ 14608b260df8 bed64f5d2f5a bed64f5d2f5a - $ hg log -r 'divergent()' + $ hg log -r 'contentdivergent()' 4:01f36c5a8fda A_3 8:7ae126973a96 A_7 9:14608b260df8 A_8 @@ -614,7 +614,7 @@ a139f71be9da a139f71be9da a139f71be9da - $ hg log -r 'divergent()' + $ hg log -r 'contentdivergent()' $ cd ..