# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@logilab.fr>
# Date 1333034323 -7200
# Node ID ccbadfae1d06ffaa99915927cd576d5d0b051ab7
# Parent  b7145eed54fe1b9ca0047066ff9e7deab6543c4c
ignore merge in qsync

diff -r b7145eed54fe -r ccbadfae1d06 hgext/qsync.py
--- 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