diff -r a5a06c9c7407 -r a450e0a2ba0a mercurial/changegroup.py --- a/mercurial/changegroup.py Wed Jan 21 16:35:09 2015 -0500 +++ b/mercurial/changegroup.py Fri Feb 06 00:55:29 2015 +0000 @@ -659,8 +659,11 @@ pr() fl = repo.file(f) o = len(fl) - if not fl.addgroup(source, revmap, trp): - raise util.Abort(_("received file revlog group is empty")) + try: + if not fl.addgroup(source, revmap, trp): + raise util.Abort(_("received file revlog group is empty")) + except error.CensoredBaseError, e: + raise util.Abort(_("received delta base is censored: %s") % e) revisions += len(fl) - o files += 1 if f in needfiles: