From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yuri Khan Newsgroups: gmane.emacs.devel Subject: Re: Dynamic loading progress Date: Mon, 9 Nov 2015 16:57:22 +0600 Message-ID: References: <871tc315y3.fsf@lifelogs.com> <83611eqk9w.fsf@gnu.org> <878u6ax7c7.fsf@lifelogs.com> <83k2ptq5t3.fsf@gnu.org> <87h9kxx60e.fsf@lifelogs.com> <877flswse5.fsf@lifelogs.com> <8737wgw7kf.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1447066817 20370 80.91.229.3 (9 Nov 2015 11:00:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 9 Nov 2015 11:00:17 +0000 (UTC) Cc: Emacs development discussions To: =?UTF-8?Q?Aur=C3=A9lien_Aptel?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 09 11:59:58 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ZvkAx-000508-7v for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 11:59:51 +0100 Original-Received: from localhost ([::1]:51710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvkAw-0006P1-CU for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 05:59:50 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvk8u-0003B8-H1 for emacs-devel@gnu.org; Mon, 09 Nov 2015 05:57:45 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zvk8t-0001Lq-SW for emacs-devel@gnu.org; Mon, 09 Nov 2015 05:57:44 -0500 Original-Received: from mail-lb0-x22e.google.com ([2a00:1450:4010:c04::22e]:34227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zvk8t-0001LY-Me for emacs-devel@gnu.org; Mon, 09 Nov 2015 05:57:43 -0500 Original-Received: by lbbwb3 with SMTP id wb3so95798679lbb.1 for ; Mon, 09 Nov 2015 02:57:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type:content-transfer-encoding; bh=PcBfCddqoqRo1yhYevcrj6sNcGmZy8mvCAOgLvgJ3aU=; b=RbdXn7fsMzWaj2/5lVXyCMsuYo+wRBbx3lAJWcFbfMpwCXE4KifewuvARcNt6bUFTr IzTLPWhoT/Z3KaNfsJxQtkXWXkMeUfXOwbnOQztgHHuU2gZVjsOu13gjHrdSeCuS5lNV sEtT2Xz9H66ELO+kHKBkrkxW5UttF7PpPvIUEa1d77oaaJaCzq4VusD5KdzPWBnaO0b+ KstOr9sZoB5GWFAoGhO0T5GDV5Iyzruq9Z9CYtcCdL8cB9XH78HK/yYij52qZAEOvRrw tKXbQisE+aklVwtqMY6SKbuvB5oRit7O7Ko9NwoUsQQLD1ctSOhd9XD9lWEA3ZpUWXB5 96eg== X-Received: by 10.112.11.231 with SMTP id t7mr13848412lbb.13.1447066662890; Mon, 09 Nov 2015 02:57:42 -0800 (PST) Original-Received: by 10.112.67.103 with HTTP; Mon, 9 Nov 2015 02:57:22 -0800 (PST) In-Reply-To: X-Google-Sender-Auth: 6Hgnywn589pjcxAQEcU8_7dJy9c X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c04::22e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:193699 Archived-At: On Mon, Nov 9, 2015 at 4:40 PM, Aur=C3=A9lien Aptel wrote: > I already merged master in my branch at some point, and did so with > `merge --squash` IIRC, note to self: never do that again. Merge --squash is history rewriting, with all of the consequences thereof. > Turns out it > made any subsequent master merge a lot harder, sorry for that. The > weird thing is most conflicting changes where actually identical but > git couldn't tell. The diff were the same on both side but git couldnt > tell they were from the same commits since they were squashed. Typical symptoms of merging a branch with a rebased version of itself.