Mercurial > hg
diff tests/test-rebase-obsolete.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 | 0975506120fb |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Thu Aug 03 13:48:39 2017 +0200 +++ b/tests/test-rebase-obsolete.t Thu Aug 03 14:01:51 2017 +0200 @@ -215,7 +215,7 @@ 08483444fef91d6224f6655ee586a65d263ad34c 4596109a6a4328c398bde3a4a3b6737cfade3003 0 (*) {'user': 'test'} (glob) 8877864f1edb05d0e07dc4ba77b67a80a7b86672 462a34d07e599b87ea08676a449373fe4e2e1347 0 (*) {'user': 'test'} (glob) 5ae4c968c6aca831df823664e706c9d4aa34473d 98f6af4ee9539e14da4465128f894c274900b6e5 0 (*) {'user': 'test'} (glob) - $ hg log --rev 'divergent()' + $ hg log --rev 'contentdivergent()' $ hg log -G o 13:98f6af4ee953 C |