Submitter | adgar@google.com |
---|---|
Date | Aug. 22, 2014, 8:47 p.m. |
Message ID | <3e73eb37f5c8b6a83798.1408740440@adgar.nyc.corp.google.com> |
Download | mbox | patch |
Permalink | /patch/5556/ |
State | Accepted |
Headers | show
Return-Path: <mercurial-devel-bounces@selenic.com> X-Original-To: patchwork@patchwork.serpentine.com Delivered-To: patchwork@patchwork.serpentine.com Received: from waste.org (waste.org [173.11.57.241]) by bz.selenic.com (Postfix) with ESMTP id 7D8FC3BE7E for <patchwork@patchwork.serpentine.com>; Fri, 22 Aug 2014 16:47:41 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id A278974401; Fri, 22 Aug 2014 15:47:40 -0500 (CDT) X-Virus-Scanned: Debian amavisd-new at waste.org Received: from waste.org ([127.0.0.1]) by localhost (waste.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id OsbGnp9qfurf; Fri, 22 Aug 2014 15:47:40 -0500 (CDT) Received: from waste.org (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id BFBE7743F8; Fri, 22 Aug 2014 15:47:33 -0500 (CDT) X-Original-To: mercurial-devel@waste.org Delivered-To: mercurial-devel@waste.org Received: from localhost (localhost [127.0.0.1]) by waste.org (Postfix) with ESMTP id F1C4374399 for <mercurial-devel@waste.org>; Fri, 22 Aug 2014 15:47:30 -0500 (CDT) X-Virus-Scanned: Debian amavisd-new at waste.org Received: from waste.org ([127.0.0.1]) by localhost (waste.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id LjyZG1ODJ6-l for <mercurial-devel@waste.org>; Fri, 22 Aug 2014 15:47:28 -0500 (CDT) Received: from mail-vc0-f201.google.com (mail-vc0-f201.google.com [209.85.220.201]) by waste.org (Postfix) with ESMTPS id 8631D743E6 for <mercurial-devel@selenic.com>; Fri, 22 Aug 2014 15:47:27 -0500 (CDT) Received: by mail-vc0-f201.google.com with SMTP id le20so1320851vcb.2 for <mercurial-devel@selenic.com>; Fri, 22 Aug 2014 13:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=content-type:mime-version:content-transfer-encoding:subject :message-id:user-agent:date:from:to; bh=OMNcCdXhqcR2t2innMXcvWvQTt9WRnNDFJ+pQGxmbLs=; b=McTovHBONeOFiNxjyxMaMnm19zOAinML+3EtrhplbmkTpnZCEhW3ZWrVMNaHcD/k4L uWxXOZwVZKwXikSHLss6kjKHs192QCzxRwJ0IErEuHth4mYfuhpdksItmuGzQczA66hZ Q+5f9esrQxWi+heBBYPudoIMSu2DAPG5WF5c8jFh9WIH0Y73bMMuciXEI22YetfuGMpl qCnAl8zR6mLS7zQQEWv88zIenkNtIWeQuv5HpImA9nabtjlzH9IxNWzPHA34obNyHtsV +i54O9VwBdpMBhtwi8n4e3aAnJhIYTHi9KHS+B3nvJW4kHbAn1FB0ktvDXL79w8pTzgF 9EFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:content-type:mime-version :content-transfer-encoding:subject:message-id:user-agent:date:from :to; bh=OMNcCdXhqcR2t2innMXcvWvQTt9WRnNDFJ+pQGxmbLs=; b=SgqexWbPzQAx4qv1q5vpO8HMGL6RXE9jB/ibigCnEmyFtMGsjeEoTwREm4Y4TjewQX /uzCFGWUisjv3D4XPX0s83fw1Dn/vV/KPmL/Z1BGeGwpvXMZkLbKpig0ogR1RxpKmSKj kqorcoC1KJI2qTFoTcL1FKZ8RIGxnoPzl4EsKA24SRf2OFIgsGSboeVJDFZf/Lo5oZNU tm0MQg+SFAWKepJp0zpJ3bnErj/HHYWYP7caRl8IkCZfwWq7xU3aaCo24qUO0cV7EdLD mx/JA3a+FURIxze9EmYclU/pN46/xEehuu9OW76+WaQg5mRAFsd4uVTpTg9yxVCSZiw3 UYyQ== X-Gm-Message-State: ALoCoQmsx25YzizZdvXhpBKXhDW3TnmhOPtFPhTlQxEvpqb2Tskp0J/BiiTN+W6yDYsd5pQVRk1SNcvn0ka0I3Tk4JckipD6/PI26eOIYmHJq7MvpIMT0YHE0o+7eqF1k08dobLGeE/o X-Received: by 10.236.124.161 with SMTP id x21mr10179348yhh.48.1408740446817; Fri, 22 Aug 2014 13:47:26 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id y50si410355yhk.4.2014.08.22.13.47.26 for <mercurial-devel@selenic.com> (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Aug 2014 13:47:26 -0700 (PDT) Received: from adgar.nyc.corp.google.com (adgar.nyc.corp.google.com [172.29.150.31]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id AB9D45A4305 for <mercurial-devel@selenic.com>; Fri, 22 Aug 2014 13:47:26 -0700 (PDT) Received: by adgar.nyc.corp.google.com (Postfix, from userid 113065) id 51FBA180F49; Fri, 22 Aug 2014 16:47:26 -0400 (EDT) MIME-Version: 1.0 Subject: [PATCH 1 of 2] histedit: drop duplicate line extracting keep option X-Mercurial-Node: 3e73eb37f5c8b6a837983c5f9d505ac4cfade546 X-Mercurial-Series-Index: 1 X-Mercurial-Series-Total: 2 Message-Id: <3e73eb37f5c8b6a83798.1408740440@adgar.nyc.corp.google.com> X-Mercurial-Series-Id: <3e73eb37f5c8b6a83798.1408740440@adgar.nyc.corp.google.com> User-Agent: Mercurial-patchbomb/3.1+34-510cafe72004 Date: Fri, 22 Aug 2014 16:47:20 -0400 From: adgar@google.com To: mercurial-devel@selenic.com X-BeenThere: mercurial-devel@selenic.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: <mercurial-devel.selenic.com> List-Unsubscribe: <http://selenic.com/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@selenic.com?subject=unsubscribe> List-Archive: <http://selenic.com/pipermail/mercurial-devel> List-Post: <mailto:mercurial-devel@selenic.com> List-Help: <mailto:mercurial-devel-request@selenic.com?subject=help> List-Subscribe: <http://selenic.com/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@selenic.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: mercurial-devel-bounces@selenic.com Errors-To: mercurial-devel-bounces@selenic.com |
Comments
adgar@google.com - Aug. 22, 2014, 8:47 p.m.
Patch
diff -r de783f2403c4 -r 3e73eb37f5c8 hgext/histedit.py --- a/hgext/histedit.py Sat Aug 16 10:43:59 2014 +0900 +++ b/hgext/histedit.py Fri Aug 22 16:37:55 2014 -0400 @@ -614,7 +614,6 @@ rules = verifyrules(rules, repo, ctxs) parentctx = repo[root].parents()[0] - keep = opts.get('keep', False) replacements = []