From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Installing changes from branches Date: Sat, 03 Apr 2010 23:53:14 +0300 Message-ID: <8363481cn9.fsf@gnu.org> References: <4BB702D9.7000102@swipnet.se> <4BB75C2E.5010104@swipnet.se> <87tyrsy248.fsf@telefonica.net> <83aatk1ou3.fsf@gnu.org> <838w941nxh.fsf@gnu.org> <87pr2go4om.fsf@telefonica.net> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE X-Trace: dough.gmane.org 1270328015 25123 80.91.229.12 (3 Apr 2010 20:53:35 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 3 Apr 2010 20:53:35 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 03 22:53:31 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1NyALR-0000Bx-HF for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 22:53:29 +0200 Original-Received: from localhost ([127.0.0.1]:54286 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NyALR-0006Yy-2X for ged-emacs-devel@m.gmane.org; Sat, 03 Apr 2010 16:53:29 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NyALJ-0006XX-U9 for emacs-devel@gnu.org; Sat, 03 Apr 2010 16:53:22 -0400 Original-Received: from [140.186.70.92] (port=46939 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NyALI-0006X3-O7 for emacs-devel@gnu.org; Sat, 03 Apr 2010 16:53:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NyALH-0003zs-Ci for emacs-devel@gnu.org; Sat, 03 Apr 2010 16:53:20 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:55407) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NyALH-0003zi-01 for emacs-devel@gnu.org; Sat, 03 Apr 2010 16:53:19 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0L0B00200J98YM00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 03 Apr 2010 23:53:17 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.124.92.42]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L0B000S1JCMW560@a-mtaout20.012.net.il>; Sat, 03 Apr 2010 23:53:11 +0300 (IDT) In-reply-to: <87pr2go4om.fsf@telefonica.net> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:123146 Archived-At: > From: =C3=93scar Fuentes > Date: Sat, 03 Apr 2010 18:56:41 +0200 >=20 > If you use `bzr diff' and `patch' for incorporating your changes in= to > `trunk', bzr is unable to track. I obviously failed to drive the point home: in this workflow, I don't _want_ bzr to track these changes. I want them to look like changes I made directly on the trunk. > So you `bzr diff -rsubmit:' will generate a diff as if you had neve= r > incorporated your local changes into `trunk'. After invoking `patch', there's a commit, so how can you say I never "incorporated the changes into `trunk'"? Perhaps you mean "merge" instead of "incorporate". In the latter case, that's exactly what I want: it does what Stefan asked for -- avoid numerous merge commits o= n the trunk when they bear no importance (due to insignificant amount o= f real changes).