From patchwork Thu Mar 16 17:56:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Terekhov, Mikhail via Gdb-patches" X-Patchwork-Id: 19617 Received: (qmail 32024 invoked by alias); 16 Mar 2017 17:56:58 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 32015 invoked by uid 89); 16 Mar 2017 17:56:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=H*MI:google, H*M:google X-HELO: mail-pg0-f74.google.com Received: from mail-pg0-f74.google.com (HELO mail-pg0-f74.google.com) (74.125.83.74) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 16 Mar 2017 17:56:56 +0000 Received: by mail-pg0-f74.google.com with SMTP id x127so1899877pgb.2 for ; Thu, 16 Mar 2017 10:56:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:message-id:date:subject:from:to; bh=K7/Kl3gopajWTOz10DisHkeoTYt/HjAyqyKvaHQ/1tk=; b=siTZeEPFtEP8UAb9woNetTBov2yXFo0EMyoD/4wju+21t0Arl+TUBJJ9OT5Zftm6FS qbW+OT2ymAh4GDgzQsks+ALxNjsLPwLQPOkbICl1HkIBrKW3GbrYreReQSYgiwTS/BzO rjDuBxTOJq6afVORG9/k2F4wtbUqJAp1L4yvSfArYIVCOvC+htYg/6/gNvQwAi1M3xid MFMgCcPJEj2VP2HHODybM5Yd7GFQEKuAmWiNM4i1lSvz4asnZbNcXPR5bli/UhiUu8AX PoisjLkC4y4hF45UJ4vV/vR6rZn4Urg1ZrjHKzmRGOiCgs0msj19j9363EuKqtsRpy44 vqvg== X-Gm-Message-State: AFeK/H3hEtlrFK9j+MCgxXyH++R4adK7LguV+BkZrUYSE0zqFcviXPA1kZmU1hQphoDcG4IODvxW1CAf2SGAeSkSiM/u8a+uM1wF4QppqurWqddT3U0IfeWk4HjBTdC4EwONkAJPpEar0/hXFmGTB0nGuvGGhjVu5cs52v/uVqSPSf63HSKIOg== MIME-Version: 1.0 X-Received: by 10.98.218.26 with SMTP id c26mr299652pfh.7.1489687015942; Thu, 16 Mar 2017 10:56:55 -0700 (PDT) Message-ID: Date: Thu, 16 Mar 2017 17:56:55 +0000 Subject: [OB PATCH] Remove patch collision markers in testsuite/ChangeLog X-Patchwork-Original-From: "Doug Evans via gdb-patches" From: "Terekhov, Mikhail via Gdb-patches" Reply-To: Doug Evans To: gdb-patches@sourceware.org X-IsSubscribed: yes Bleah. commit 2cc36e25db366d70a975702b61c7700ae934d4d0 Author: Doug Evans Date: Thu Mar 16 10:39:26 2017 -0700 Remove collision markers from earlier commit diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 39ff712e74..aa07cb05ff 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,10 +1,9 @@ -<<<<<<< HEAD 2017-03-16 Thomas Preud'homme * gdb.cp/m-static.exp: Fix expectation for prototype of test5.single_constructor and single_constructor::single_constructor. -======= -2017-03-15 Doug Evans + +2017-03-16 Doug Evans * gdb.guile/scm-value.c (main) Delete locals sptr, sn. * gdb.guile/scm-lazy-string.c: New file. @@ -12,7 +11,7 @@ * gdb.guile/scm-lazy-string.exp: ... here, new file. Add more tests for pointer, array, typedef lazy strings. -2017-03-15 Doug Evans +2017-03-16 Doug Evans PR python/17728, python/18439, python/18779 * gdb.python/py-value.c (main) Delete locals sptr, sn. @@ -21,7 +20,6 @@ * gdb.python/py-value.exp: Move lazy string tests to ... * gdb.python/py-lazy-string.exp: ... here. Add more tests for pointer, array, typedef lazy strings. ->>>>>>> Fix various python lazy string bugs. 2017-03-14 Anton Kolesov