Mercurial > evolve
changeset 5164:3a2a17b1985c
branching: merge stable back into default
evolve 9.3.0 have been released.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 04 Mar 2020 17:49:58 +0100 |
| parents | e78926a1a473 (diff) 3ff25aafdb4e (current diff) |
| children | 7d0d066329f4 |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 6 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/metadata.py Sat Feb 29 14:59:23 2020 +0700 +++ b/hgext3rd/evolve/metadata.py Wed Mar 04 17:49:58 2020 +0100 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = b'9.3.1.dev' +__version__ = b'9.4.0.dev' testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' minimumhgversion = b'4.6' buglink = b'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Sat Feb 29 14:59:23 2020 +0700 +++ b/hgext3rd/topic/__init__.py Wed Mar 04 17:49:58 2020 +0100 @@ -202,7 +202,7 @@ b'topic.active': b'green', } -__version__ = b'0.18.1.dev' +__version__ = b'0.19.0.dev' testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3' minimumhgversion = b'4.6'
--- a/tests/test-evolve-content-divergent-first-changeset.t Sat Feb 29 14:59:23 2020 +0700 +++ b/tests/test-evolve-content-divergent-first-changeset.t Wed Mar 04 17:49:58 2020 +0100 @@ -6,6 +6,7 @@ > evolution.allowdivergence = True > EOF + This test file tests the case of content-divergence resolution of changesets that have the null revision as the parent.
--- a/tests/test-evolve-interrupted.t Sat Feb 29 14:59:23 2020 +0700 +++ b/tests/test-evolve-interrupted.t Wed Mar 04 17:49:58 2020 +0100 @@ -52,7 +52,7 @@ $ hg l @ 2 apricot and blueberry - * 1 banana + % 1 banana | x 0 apricot @@ -80,7 +80,7 @@ $ hg l @ 2 apricot and blueberry - * 1 banana + % 1 banana | x 0 apricot
--- a/tests/test-evolve-issue5967.t Sat Feb 29 14:59:23 2020 +0700 +++ b/tests/test-evolve-issue5967.t Wed Mar 04 17:49:58 2020 +0100 @@ -69,6 +69,6 @@ rewritten(description, content) as 4d6fec23dcc4 using amend by test (Thu Jan 01 00:00:00 1970 +0000) $ hg olog --hidden --all 1 - x dd9b5dd30cd6 (1) banana + % dd9b5dd30cd6 (1) banana pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-progress.t Sat Feb 29 14:59:23 2020 +0700 +++ b/tests/test-evolve-progress.t Wed Mar 04 17:49:58 2020 +0100 @@ -42,8 +42,6 @@ move:[2] third hg rebase -r 769574b07a96 -d 5f16d91ecde0 evolve: 2/3 changesets (66.67%) - unmatched files in other: - b resolving manifests branchmerge: True, force: True, partial: False ancestor: 4f60c78b6d58, local: 5f16d91ecde0+, remote: 769574b07a96 @@ -154,8 +152,6 @@ atop:[11] second hg rebase -r 53c0008d98a0 -d 60a86497fbfe evolve: 2/3 changesets (66.67%) - unmatched files in other: - b resolving manifests branchmerge: True, force: True, partial: False ancestor: 5f16d91ecde0, local: 60a86497fbfe+, remote: 53c0008d98a0