From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?UTF-8?Q?Aur=C3=A9lien_Aptel?= Newsgroups: gmane.emacs.devel Subject: Re: Dynamic loading progress Date: Mon, 9 Nov 2015 15:26:18 +0100 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> <87io5bv1it.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1447079225 31919 80.91.229.3 (9 Nov 2015 14:27:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 9 Nov 2015 14:27:05 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 09 15:27:03 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 1ZvnPN-00013I-9R for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 15:26:57 +0100 Original-Received: from localhost ([::1]:52979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvnPH-0003pu-Os for ged-emacs-devel@m.gmane.org; Mon, 09 Nov 2015 09:26:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvnOm-0003Z4-Ij for emacs-devel@gnu.org; Mon, 09 Nov 2015 09:26:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZvnOl-0007qu-Ie for emacs-devel@gnu.org; Mon, 09 Nov 2015 09:26:20 -0500 Original-Received: from mail-lf0-x233.google.com ([2a00:1450:4010:c07::233]:33230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZvnOl-0007qq-AF for emacs-devel@gnu.org; Mon, 09 Nov 2015 09:26:19 -0500 Original-Received: by lffz63 with SMTP id z63so31846399lff.0 for ; Mon, 09 Nov 2015 06:26:18 -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:date:message-id:subject :from:to:content-type; bh=4A81032fxziy5fOW3SK6TZqXw3JAvtTV5V8DOc7XBCo=; b=OzmXh8V1sU1LJAJEgEQgwh6LGHvhev58XlyIwSvtfBlDrgZyJt15vfiolVi3od74Je o80ZLJXmgoD6daYVWJnNYNHs+V9szc0jyPrOW1n09WNok6aDXy2yc+xPHdCK39OuQLW3 f+AgXemkOwloimN+k0PQlF7ub3mWKxCSZVg2w0E1EDjC3PS2Dt6zjmO2m+KC6ES0UAdY CKr1vw/FeTvbnTG88sQNRw9OPi3Av0i8bQPUiI2mqb991QJu0IxL6yPJ4bzSYxMZYcGa CqQH4QBEMuhcvkLI72vYHYZp+DU9Ii7M3QpSAMwad/nEVGP5qZrKg4QRJiUIAAswLi7u iADQ== X-Received: by 10.25.85.193 with SMTP id j184mr8594798lfb.2.1447079178510; Mon, 09 Nov 2015 06:26:18 -0800 (PST) Original-Received: by 10.112.160.133 with HTTP; Mon, 9 Nov 2015 06:26:18 -0800 (PST) In-Reply-To: X-Google-Sender-Auth: 3E6kFbPGikTbH1DlSaF7PKPD9tk X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c07::233 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:193709 Archived-At: On Mon, Nov 9, 2015 at 2:47 PM, Steinar Bang wrote: >> If Ted is going to do the job he has basically two choices: >> - Preserve all history of the branch >> - Squash all history of the branch into a single commit > > (And I personally wouldn't have tried squashing after I have merged in > from master) After merging master in the branch i can simply use a diff between the 2 (which shouldnt include conflicting/redundant changes this time) as what I'll use to make the new clean branch.