# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1443240647 18000
# Node ID 0224d22ef5d815c86d7ebce6644f056c406acbfd
# Parent  a672cc61ab1de50d931f215d89fafc22906ba356# Parent  f31ddc9bfa5f8f28cd899e907a0a9edb072b3e9a
merge with stable

diff -r a672cc61ab1d -r 0224d22ef5d8 mercurial/commands.py
--- a/mercurial/commands.py	Mon Sep 14 19:25:34 2015 -0400
+++ b/mercurial/commands.py	Fri Sep 25 23:10:47 2015 -0500
@@ -6388,6 +6388,12 @@
                 try:
                     op = bundle2.processbundle(repo, gen, lambda: tr)
                     tr.close()
+                except error.UnsupportedPartError as exc:
+                    raise util.Abort(_('%s: unknown bundle feature, %s')
+                                     % (fname, exc),
+                                     hint=_("see https://mercurial.selenic.com/"
+                                            "wiki/BundleFeature for more "
+                                            "information"))
                 finally:
                     if tr:
                         tr.release()