# HG changeset patch # User David Douard # Date 1333468035 -7200 # Node ID 94360b577857a4d202aacc88de3c16ea1806aa25 # Parent 4df233db5d42d28c01ba4d4933af9b9915043a11 qsync: display short node repr on error diff -r 4df233db5d42 -r 94360b577857 hgext/qsync.py --- 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