Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with 9.0.0
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 07 Jun 2019 02:25:02 +0200
changeset 4669 daab6d665687
parent 4668 194adaeb84e8 (diff)
parent 4667 344befcf63aa (current diff)
child 4676 b6c819facbe8
branching: merge with 9.0.0
hgext3rd/evolve/metadata.py file | annotate | diff | comparison | revisions
hgext3rd/topic/__init__.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/metadata.py	Fri Jun 07 02:22:05 2019 +0200
+++ b/hgext3rd/evolve/metadata.py	Fri Jun 07 02:25:02 2019 +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__ = '9.0.1.dev'
+__version__ = '9.1.0.dev'
 testedwith = '4.5.2 4.6.2 4.7 4.8 4.9 5.0'
 minimumhgversion = '4.5'
 buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Fri Jun 07 02:22:05 2019 +0200
+++ b/hgext3rd/topic/__init__.py	Fri Jun 07 02:25:02 2019 +0200
@@ -186,7 +186,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.15.1.dev'
+__version__ = '0.16.0.dev'
 
 testedwith = '4.5.2 4.6.2 4.7 4.8 4.9 5.0'
 minimumhgversion = '4.5'
--- a/tests/test-evolve-progress.t	Fri Jun 07 02:22:05 2019 +0200
+++ b/tests/test-evolve-progress.t	Fri Jun 07 02:25:02 2019 +0200
@@ -28,7 +28,6 @@
   atop:[4] first v2
   hg rebase -r 4f60c78b6d58 -d fd0a2402f834
   evolve: 1/3 changesets (33.33%)
-    searching for copies back to rev 0
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58
@@ -43,10 +42,7 @@
   move:[2] third
   hg rebase -r 769574b07a96 -d 5f16d91ecde0
   evolve: 2/3 changesets (66.67%)
-    searching for copies back to rev 0
-    unmatched files in other (from base):
-     b
-    unmatched files in other (from topological common ancestor):
+    unmatched files in other:
      b
   resolving manifests
    branchmerge: True, force: True, partial: False
@@ -62,7 +58,6 @@
   move:[3] fourth
   hg rebase -r 22782fddc0ab -d 53c0008d98a0
   evolve: 3/3 changesets (100.00%)
-    searching for copies back to rev 0
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab
@@ -96,7 +91,6 @@
   atop:[8] first v3
   hg rebase -r 5f16d91ecde0 -d 152c368c622b
   evolve: 1/1 changesets (100.00%)
-    searching for copies back to rev 4
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0
@@ -127,7 +121,6 @@
   atop:[10] first v4
   hg rebase -r df5d742141b0 -d f8d7d38c0a88
   evolve: 1/3 changesets (33.33%)
-    searching for copies back to rev 8
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 152c368c622b, local: f8d7d38c0a88+, remote: df5d742141b0
@@ -160,10 +153,7 @@
   atop:[11] second
   hg rebase -r 53c0008d98a0 -d 60a86497fbfe
   evolve: 2/3 changesets (66.67%)
-    searching for copies back to rev 4
-    unmatched files in other (from base):
-     b
-    unmatched files in other (from topological common ancestor):
+    unmatched files in other:
      b
   resolving manifests
    branchmerge: True, force: True, partial: False
@@ -178,7 +168,6 @@
   move:[7] fourth
   hg rebase -r 385376d04062 -d b2de95304e32
   evolve: 3/3 changesets (100.00%)
-    searching for copies back to rev 4
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 53c0008d98a0, local: b2de95304e32+, remote: 385376d04062
evolve