Submitter | Alexander Fomin |
---|---|
Date | March 21, 2017, 5:08 p.m. |
Message ID | <6e4849bc2c126815e8ed.1490116115@devvm2125.lla2.facebook.com> |
Download | mbox | patch |
Permalink | /patch/19531/ |
State | Changes Requested |
Headers | show
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@mercurial-scm.org Delivered-To: patchwork@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 5AE0E2C1AE; Tue, 21 Mar 2017 14:40:53 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Ta57VEq8qP04; Tue, 21 Mar 2017 14:40:53 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id C24382C1AF; Tue, 21 Mar 2017 14:40:46 -0400 (EDT) X-Original-To: mercurial-devel@mercurial-scm.org Delivered-To: mercurial-devel@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 0C33F2C1AE for <mercurial-devel@mercurial-scm.org>; Tue, 21 Mar 2017 13:08:46 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id XJVcLlJyHCFs for <mercurial-devel@mercurial-scm.org>; Tue, 21 Mar 2017 13:08:43 -0400 (EDT) Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by mercurial-scm.org (Postfix) with ESMTPS id CA4F82C1AF for <mercurial-devel@mercurial-scm.org>; Tue, 21 Mar 2017 13:08:43 -0400 (EDT) Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v2LH7SsE015052 for <mercurial-devel@mercurial-scm.org>; Tue, 21 Mar 2017 10:08:42 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=content-type : mime-version : content-transfer-encoding : subject : message-id : in-reply-to : references : date : from : to; s=facebook; bh=T3rTyFKSr5PCLBITyf5hcUqd+MOnvbJHG45RLjzYRBY=; b=FqRJGfEdKGgWm2wssOXhLBJKHwxbcI+Fbd5nXmyJUzDpN2XsWg39aKaLj/AgbII+U1gd tNxWGD35p75vzmJOsIX+mK+FFwkN+sqdBqMqdpbKCkxmUn9IO+1LFMw1ZJ86l5RYp/aq y1zeY9RXA0gpSMGtZ78Z7IYbuYIM7prH8rQ= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 29b6200tbj-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Tue, 21 Mar 2017 10:08:42 -0700 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB13.TheFacebook.com (192.168.16.23) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 21 Mar 2017 10:08:41 -0700 Received: from devvm2125.lla2.facebook.com (2401:db00:3020:9187:face:0:46:0) by mx-out.facebook.com (10.103.99.99) with ESMTP id 089b9b660e5911e796f70002c9dfb610-9bfa9a0 for <mercurial-devel@mercurial-scm.org>; Tue, 21 Mar 2017 10:08:42 -0700 MIME-Version: 1.0 Subject: [PATCH 2 of 7] transplant: treat all files as text when applying a changeset X-Mercurial-Node: 6e4849bc2c126815e8edfe176257883907596361 X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 7 Message-ID: <6e4849bc2c126815e8ed.1490116115@devvm2125.lla2.facebook.com> X-Mercurial-Series-Id: <3c43572fec91b9caa83d.1490116114@devvm2125.lla2.facebook.com> In-Reply-To: <3c43572fec91b9caa83d.1490116114@devvm2125.lla2.facebook.com> References: <3c43572fec91b9caa83d.1490116114@devvm2125.lla2.facebook.com> User-Agent: Mercurial-patchbomb/4.1.1+548-9a11a79f6bcd Date: Tue, 21 Mar 2017 10:08:35 -0700 From: Alexander Fomin <afomin@fb.com> To: <mercurial-devel@mercurial-scm.org> X-FB-Internal: Safe X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-03-21_14:, , signatures=0 X-Mailman-Approved-At: Tue, 21 Mar 2017 18:40:44 +0000 X-BeenThere: mercurial-devel@mercurial-scm.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.mercurial-scm.org> List-Unsubscribe: <https://www.mercurial-scm.org/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=unsubscribe> List-Archive: <http://www.mercurial-scm.org/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@mercurial-scm.org> List-Help: <mailto:mercurial-devel-request@mercurial-scm.org?subject=help> List-Subscribe: <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org> |
Comments
Alexander Fomin - March 21, 2017, 5:08 p.m.
Patch
diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -143,6 +143,8 @@ class transplanter(object): pulls = [] diffopts = patch.difffeatureopts(self.ui, opts) diffopts.git = True + # Enable binary diffs in Git mode + diffopts.text = True lock = tr = None try: