Mercurial > evolve

changeset 195:ccbadfae1d06

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ignore merge in qsync
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Thu, 29 Mar 2012 17:18:43 +0200
parents b7145eed54fe
children dea67dae27a4
files hgext/qsync.py
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/qsync.py	Wed Mar 28 14:09:01 2012 +0200
+++ b/hgext/qsync.py	Thu Mar 29 17:18:43 2012 +0200
@@ -124,9 +124,12 @@
 def get_current_data(repo):
     """Return what would be exported if not previous data exists"""
     data = []
-    for ctx in repo.set('draft() - obsolete()'):
+    for ctx in repo.set('draft() - (obsolete() + merge())'):
         name = makename(ctx)
         data.append([ctx.hex(), makename(ctx)])
+    merges = repo.revs('draft() and merge()')
+    if merges:
+        repo.ui.warn('ignoring %i merge\n' % len(merges))
     return data