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: imagemagick branch Date: Tue, 18 May 2010 14:42:57 +0300 Message-ID: <83vdala11a.fsf@gnu.org> References: <831vd9bmlg.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1274183425 7238 80.91.229.12 (18 May 2010 11:50:25 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 18 May 2010 11:50:25 +0000 (UTC) Cc: emacs-devel@gnu.org To: joakim@verona.se Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue May 18 13:50:22 2010 connect(): No such file or directory 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 1OELJV-0006GT-24 for ged-emacs-devel@m.gmane.org; Tue, 18 May 2010 13:50:21 +0200 Original-Received: from localhost ([127.0.0.1]:35659 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OELJU-0004s9-8v for ged-emacs-devel@m.gmane.org; Tue, 18 May 2010 07:50:20 -0400 Original-Received: from [140.186.70.92] (port=52036 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OELII-0003sK-9C for emacs-devel@gnu.org; Tue, 18 May 2010 07:49:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OELCS-0001Zj-NT for emacs-devel@gnu.org; Tue, 18 May 2010 07:43:07 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:36033) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OELCL-0001Yk-Iz for emacs-devel@gnu.org; Tue, 18 May 2010 07:43:02 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0L2M007005V1GS00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Tue, 18 May 2010 14:42:52 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.126.197.161]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L2M006GP5VFUL20@a-mtaout23.012.net.il>; Tue, 18 May 2010 14:42:52 +0300 (IDT) In-reply-to: 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:124888 Archived-At: > From: joakim@verona.se > Cc: emacs-devel@gnu.org > Date: Tue, 18 May 2010 12:41:38 +0200 > > Yes, the code could probably safely be added to trunk. Even if one > activates imagemagick with "configure --with-imagemagick=yes" > imagemagick wont kick in unless you execute (imagemagick-register-types) Then I suggest to talk to Stefan and Yidong and ask for their permission to merge. > Another question then, how do I merge best to trunk? I'm reading: > http://www.emacswiki.org/emacs/BzrForEmacsDevs#MergeToUpstream > but it suggests removing my local branch after merging. > > I would like to continue to add some more experimental functions to > the branch, and later merge these to trunk. Would that also be ok? > Or would it be better to create a new branch for this purpose? You can keep the old branch, but it would be best to resync it to trunk after you merge your current code with the trunk. Something like this: cd ../trunk bzr up bzr merge ../imagemagick # resolve conflicts, if any # build, fix any build errors # test, fix any bugs resulting from merge bzr ci The last "bzr ci" could fail if someone committed to the master repository in the meantime. IN that case, you will need another "bzr up" before "bzr ci". At this point, trunk has the same code you have on your branch. Now resync the branch with the trunk: cd ../imagemagick bzr pull --overwrite Now your branch is identical to the trunk, and you can continue development in it. When you are done, merge again with the trunk, as shown above. Note that "pull --overwrite" will overwrite any changes in your branch that were not merged to the trunk. I assume from your description that there will be no such changes. If you do have changes whcih you want not to merge at this point, then just continue developing in the imagemagick branch without the "pull --overwrite" step. Then, when you are done with another batch of changes, merge with trunk again, as shown above, and commit to the master repository.