From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: Please test the merge of the concurrency branch Date: Sun, 11 Dec 2016 21:05:47 -0600 Message-ID: <87mvg1j184.fsf@red-bean.com> References: <83oa0lgnzx.fsf@gnu.org> <87a8c46773.fsf@red-bean.com> <837f78gt0f.fsf@gnu.org> Reply-To: Karl Fogel NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1481512076 2407 195.159.176.226 (12 Dec 2016 03:07:56 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 12 Dec 2016 03:07:56 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) Cc: tom@tromey.com, raeburn@raeburn.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 12 04:07:47 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cGGxv-0007H1-D6 for ged-emacs-devel@m.gmane.org; Mon, 12 Dec 2016 04:07:47 +0100 Original-Received: from localhost ([::1]:58292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGGxx-0001rX-TF for ged-emacs-devel@m.gmane.org; Sun, 11 Dec 2016 22:07:49 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGGxO-0001rA-CO for emacs-devel@gnu.org; Sun, 11 Dec 2016 22:07:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGGxL-000311-7N for emacs-devel@gnu.org; Sun, 11 Dec 2016 22:07:14 -0500 Original-Received: from mail-io0-f194.google.com ([209.85.223.194]:33751) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cGGxL-0002yQ-4B; Sun, 11 Dec 2016 22:07:11 -0500 Original-Received: by mail-io0-f194.google.com with SMTP id p13so18992102ioi.0; Sun, 11 Dec 2016 19:06:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:reply-to:date:in-reply-to :message-id:user-agent:mime-version; bh=1mq74RkoE9N5WUxt3W4X4T/V3xLOlUMCuC8b+BeVTwM=; b=QunFExRbfZcEYy56i0s5htSg14C94MgKPRjYHWNv3ztRvICMiZplRnOrOmkUmciKA1 tXMOImT8nMzb5JlXjCX4VALJrKcy1eyMsbrS/imUtPvyZYuBEf82Q6tG1ux9LvTeNhUg YyMXudZ8iofOXRKFLQ1tnz45QMzoDj1FfgaFy7lBjgOnjwu9GG7b873uS+BxNd3ALyQ2 yFU9xojZaNGtGx6thNkJCidcPw1NagXhLGJ/o8Dh424Czfk9Q93uO6nMAwBNLDvQMVb9 cHWfedoHCZ2J2sxlABNHPEoJbFq0/3Gzm1ZnN5s9C1WLaT5O1EkCbYIO8cEXsAKnXUPe /Jqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:references:reply-to :date:in-reply-to:message-id:user-agent:mime-version; bh=1mq74RkoE9N5WUxt3W4X4T/V3xLOlUMCuC8b+BeVTwM=; b=m9cKiAPgWRIBB3nVwSbWXz01ZbjD7G7lMtP9VpqRgOrqzC5K1Nt8GoZKrBHIIaLZWa 6cBpjZWZAcEbtz8XpdLtCI3PzXzyAEuPfzqZcjvVFYKqGDqScmFRwcPiFQbV3CFaQ+rC txbqsLJJzKf07oKtLDIrGa6Kmy8mJ1kR2j7AiCPdQqUOasLHnvAGemFRwGltJL5gCqAk LngN6F+8xDNMvkAMrVuzpLZ4SysNCdadsHBzm6e5c0f0pKgBLLaO6Ko/WpBgEKyhNTHt IeYStKVJI39wP9DH1yNvMIRmKnzSaln4p7qjUkewwKB+k3i6gWkqdEkQLsiAELLEgb/Y VPtQ== X-Gm-Message-State: AKaTC01AvXtAiU46LpXe/iQB5wKMIm4muTtUaOnw4pwScFlRm8vT5WiAJZVhEhXwYXnOTg== X-Received: by 10.107.170.30 with SMTP id t30mr66507960ioe.200.1481511949124; Sun, 11 Dec 2016 19:05:49 -0800 (PST) Original-Received: from floss (207-237-210-85.c3-0.grn-ubr1.chi-grn.il.cable.rcn.com. [207.237.210.85]) by smtp.gmail.com with ESMTPSA id m127sm11193216itc.19.2016.12.11.19.05.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 11 Dec 2016 19:05:48 -0800 (PST) In-Reply-To: <837f78gt0f.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 10 Dec 2016 09:09:20 +0200") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.223.194 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:210322 Archived-At: Eli Zaretskii writes: >> By the way, I also built an earlier revision (I don't remember the >> rev id now) from the branch, and used it for about an hour, likewise >> with no problems. Then at some point I did 'git pull' and was >> surprised to get a merge -- surprised, because I had no local >> modifications. I assume this means you or someone rebased the >> branch at some point? > >Which branch? concurrency or test-concurrency? These are different >branches; the latter is actually master with concurrency merged into >it (in de4624c), and with some followup commits to fix problems. 'test-concurrency' only. >If you checked out the test-concurrency branch, then there were no >rebases on it since it was pushed, a day before I announced it. I >only added a few commits since then. Hunh. Well, I don't know what happened, in that case. My local repository definitely didn't like two successive pulls a couple of hours apart, on the test-concurrency branch. I did 'git reset --hard HEAD' after the first time and then re-pulled, to make sure I was really seeing what I thought I was seeing. I had no local modifications or anything (if I had I would have stashed them). Since there's no easy way to reconstruct or debug it now, and the branch has landed on master anyway, I guess I'll let this remain a mystery.