From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kelvin White Newsgroups: gmane.emacs.devel Subject: Re: merging revisions into emacs24 from trunk Date: Thu, 6 Nov 2014 12:28:01 -0500 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Trace: ger.gmane.org 1415294922 27786 80.91.229.3 (6 Nov 2014 17:28:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 6 Nov 2014 17:28:42 +0000 (UTC) Cc: Emacs development discussions To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 06 18:28:35 2014 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 1XmQrK-00083O-UT for ged-emacs-devel@m.gmane.org; Thu, 06 Nov 2014 18:28:35 +0100 Original-Received: from localhost ([::1]:55297 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmQrK-0002Be-4W for ged-emacs-devel@m.gmane.org; Thu, 06 Nov 2014 12:28:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmQqs-00026Y-4N for emacs-devel@gnu.org; Thu, 06 Nov 2014 12:28:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XmQqo-0007HC-G6 for emacs-devel@gnu.org; Thu, 06 Nov 2014 12:28:06 -0500 Original-Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]:41693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XmQqo-0007G8-A6 for emacs-devel@gnu.org; Thu, 06 Nov 2014 12:28:02 -0500 Original-Received: by mail-wi0-f179.google.com with SMTP id h11so2194380wiw.12 for ; Thu, 06 Nov 2014 09:28:01 -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:cc:content-type; bh=tG3VpWGa6+JWI5CZ9V/a7OJkLIJ9TXTOOKMEmHveF84=; b=jjzBXMTmyKP1BgndH01dFqFnoFb8RpfNJvK5ogNXi+E8ly2gFqKaXlhCQxdMKykmfd R9cK0VX/ZHi1/ZlX8DnM4LICw2+fStF6XZKh04UN798GYdHzLz3Jo9f2fzx3jv9oKux7 Lt+gh3zINFQ7eQ31fgaejvgov6evUQE395Sx8QQDoj2qYxeEDH6t4hqsaixaWhqCs3Ny sHo1yXRdrVgza0EWTLKBChK7rGKAHsqyWdD5bLDPDaPF7iKl5nVP6N3CfmaH2dMs0fdE w6PdLFR/LbjEGvptiIy/emApnTyGO06IC06H36uaXLN0KIPMDU7FP8Kg+RMPDF1RLxZj DJCQ== X-Received: by 10.180.99.1 with SMTP id em1mr16583426wib.29.1415294881305; Thu, 06 Nov 2014 09:28:01 -0800 (PST) Original-Received: by 10.27.215.135 with HTTP; Thu, 6 Nov 2014 09:28:01 -0800 (PST) In-Reply-To: X-Google-Sender-Auth: uzFCQ55MUweIITrOauD7PjHeTdw X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::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:176466 Archived-At: > Just somehow get the change you want to backport (e.g. "bzr diff .. | patch" > or "bzr merge -r NN..MM" or even by hand) and commit it. It's that simple. > The only trick is that the commit message should include the key word > "backport" somewhere so that bzrmerge.el will know to skip it to avoid > spurious merge conflicts when we try to merge emacs-24 back into trunk. I imagined it would be simple just wanted to make sure I didn't miss anything. I tried the latter and had many conflicts, so I created a patch with bzr diff. I will commit it shortly, thanks.