Mercurial > evolve
changeset 2709:5d54de9cf50f
merge back with stable
(version updated in the process)
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 02 Jul 2017 19:43:44 +0200 |
| parents | 189fd9d6a405 (current diff) 1907f5af88a8 (diff) |
| children | e22de367fc74 |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py tests/test-discovery-obshashrange.t tests/test-drop.t tests/test-evolve-cycles.t tests/test-evolve-obshistory-complex.t tests/test-evolve-obshistory.t tests/test-evolve-templates.t tests/test-inhibit.t tests/test-obsolete.t tests/test-sharing.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-wireproto.t |
| diffstat | 6 files changed, 33 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sun Jul 02 17:13:35 2017 +0200 +++ b/.hgtags Sun Jul 02 19:43:44 2017 +0200 @@ -54,3 +54,4 @@ 6da4ca7b3e4fc214a363a5cf723554f114b7f51e 6.3.0 e358c0263e4629746a7c925429c951f67d4b02b1 6.3.1 e60248f26f923f4460682252f7863ff86f7b86b0 6.4.0 +734c0bc066cdc0121a20a9cb44c8cc30c653be94 6.5.0
--- a/README Sun Jul 02 17:13:35 2017 +0200 +++ b/README Sun Jul 02 19:43:44 2017 +0200 @@ -121,25 +121,34 @@ Changelog ========= -6.5.0 - in progress +6.5.0 -- 2017-07-02 ------------------- +features: + - obslog: gain a --patch flag to display changes introduced by the evolution (Currently limited to in simple case only) + - log: display obsolescence fate by default, (future 4.3 only) + - doc: various minor improvement. - - stack: also show the unstable status for the current changeset (issue5553) +bugfixes: + + - evolve: fix branch preservation for merge, + - obsfate: improve support for advanced template reformating, + - split: preserve author of the splitted changeset. + - grab: properly fix hg executable on windows. + +topic (0.1.0): + + - stack: also show the unstable status for the current changeset, (issue5553) - stack: properly abort when and unknown topic is requested, - - stack: add basic and raw support for named branches - - topic: changing topic on revs no longer adds extra instability (issue5441) + - stack: add basic and raw support for named branches, + - topic: changing topic on revs no longer adds extra instability, (issue5441) - topic: topics: rename '--change' flag to '--rev' flag, - topic: multiple large performance improvements, - topic: various small output improvement, + - topic: improved topic preservation for various commands. -6.4.1 - in progress -------------------- - - - obsfate: improve support for advanced template reformating - - split: preserve author of the splitted changeset, 6.4.0 -- 2017-06-16 -------------------
--- a/debian/changelog Sun Jul 02 17:13:35 2017 +0200 +++ b/debian/changelog Sun Jul 02 19:43:44 2017 +0200 @@ -1,3 +1,9 @@ +mercurial-evolve (6.5.0-1) UNRELEASED; urgency=medium + + * new upstream release + + -- Pierre-Yves David <marmoute@nodosa.octopoid.net> Sun, 02 Jul 2017 19:35:17 +0200 + mercurial-evolve (6.4.0-1) unstable; urgency=medium * new upstream release
--- a/hgext3rd/evolve/__init__.py Sun Jul 02 17:13:35 2017 +0200 +++ b/hgext3rd/evolve/__init__.py Sun Jul 02 19:43:44 2017 +0200 @@ -1684,9 +1684,11 @@ progresscb=None): """Stabilize an unstable changeset""" pctx = orig.p1() + keepbranch = orig.p1().branch() != orig.branch() if len(orig.parents()) == 2: if not pctx.obsolete(): pctx = orig.p2() # second parent is obsolete ? + keepbranch = orig.p2().branch() != orig.branch() elif orig.p2().obsolete(): hint = _("Redo the merge (%s) and use `hg prune <old> " "--succ <new>` to obsolete the old one") % orig.hex()[:12] @@ -1744,7 +1746,6 @@ repo.ui.note(todo) if progresscb: progresscb() - keepbranch = orig.p1().branch() != orig.branch() try: relocate(repo, orig, target, pctx, keepbranch) except MergeFailure:
--- a/hgext3rd/evolve/metadata.py Sun Jul 02 17:13:35 2017 +0200 +++ b/hgext3rd/evolve/metadata.py Sun Jul 02 19:43:44 2017 +0200 @@ -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__ = '6.5.0.dev' -testedwith = '3.8.4 3.9.2 4.0.2 4.1.2 4.2' +__version__ = '6.6.0.dev' +testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.1' minimumhgversion = '3.8' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Sun Jul 02 17:13:35 2017 +0200 +++ b/hgext3rd/topic/__init__.py Sun Jul 02 19:43:44 2017 +0200 @@ -113,7 +113,10 @@ 'topic.active': 'green', } -testedwith = '4.0.2 4.1.3 4.2' +version = '0.2.0.dev' +testedwith = '4.0.2 4.1.3 4.2.1' +minimumhgversion = '4.0' +buglink = 'https://bz.mercurial-scm.org/' def _contexttopic(self, force=False): if not (force or self.mutable()):