Mercurial > hg > evolve

changeset 1192:661f3a112f7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pull: run obsmarker discovery only on the common set If the discovery is run before the obsmarker push, pulled revs does not exist in the repository yet.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 29 Aug 2014 16:13:01 +0200
parents 26334cfd4e95
children 580a2d838996
files hgext/evolve.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -2484,7 +2484,7 @@
     cl = pullop.repo.changelog
     remote = pullop.remote
     unfi = repo.unfiltered()
-    revs = unfi.revs('::%ln', pullop.pulledsubset)
+    revs = unfi.revs('::%ln', pullop.common)
     common = [nullid]
     if remote.capable('_evoext_obshash_0'):
         obsexcmsg(repo.ui, "looking for common markers in %i nodes\n"
@@ -2652,6 +2652,7 @@
         caps += ' _evoext_pushobsmarkers_0'
         caps += ' _evoext_pullobsmarkers_0'
         caps += ' _evoext_obshash_0'
+        caps += ' _evoext_getbundle_obscommon'
     return caps