author | David Douard <david.douard@logilab.fr> |
Tue, 03 Apr 2012 17:47:15 +0200 | |
changeset 201 | 94360b577857 |
parent 200 | 4df233db5d42 |
child 202 | 83b7e2c62ac3 |
hgext/qsync.py | file | annotate | diff | comparison | revisions |
--- a/hgext/qsync.py Mon Apr 02 17:40:26 2012 +0200 +++ b/hgext/qsync.py Tue Apr 03 17:47:15 2012 +0200 @@ -151,6 +151,7 @@ if newnodes: newnodes = [n for n in newnodes if n] # remove killing if len(newnodes) > 1: + newnodes = [short(nodes[0]) for nodes in newnodes] raise util.Abort('%s have more than one newer version: %s'% (oldname, newnodes)) if newnodes: # else, changeset have been killed