Submitter | michaeljedgar@gmail.com |
---|---|
Date | Sept. 15, 2014, 12:01 p.m. |
Message ID | <36724b851222bd5c1166.1410782488@adgar-macbookpro3.roam.corp.google.com> |
Download | mbox | patch |
Permalink | /patch/5825/ |
State | Accepted |
Headers | show |
Comments
Patch
diff -r 03684b289116 -r 36724b851222 mercurial/merge.py --- a/mercurial/merge.py Sun Sep 14 20:32:34 2014 -0400 +++ b/mercurial/merge.py Sun Sep 14 16:41:32 2014 -0400 @@ -597,7 +597,15 @@ repo.ui.debug(" %s: %s -> g\n" % (f, msg)) if verbose: repo.ui.note(_("getting %s\n") % f) - wwrite(f, fctx(f).data(), args[0]) + fc = fctx(f) + try: + data = fc.data() + except errormod.CensoredNodeError, e: + if not fc.censorallowed(): + raise + repo.ui.warn(_('warning: censored file is empty: %s\n') % f) + data = '' + wwrite(f, data, args[0]) if i == 100: yield i, f i = 0