# HG changeset patch # User Matt Mackall # Date 1325279225 21600 # Node ID 6b84cdcb05b905c1e594997a50e9ed8a48610165 # Parent 6eb5bbaa1e7371b77601a39bf890a37b1b494536 fetch: fix unneeded commit when no merge attempted (issue2847) diff -r 6eb5bbaa1e73 -r 6b84cdcb05b9 hgext/fetch.py --- a/hgext/fetch.py Fri Dec 30 14:31:59 2011 -0600 +++ b/hgext/fetch.py Fri Dec 30 15:07:05 2011 -0600 @@ -102,6 +102,9 @@ (len(newheads) - 1)) return 1 + if not newheads: + return 0 + # Otherwise, let's merge. err = False if newheads: