From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nick Roberts Newsgroups: gmane.emacs.devel Subject: Re: Syncing Gnus and Emacs repositories Date: Mon, 18 Jun 2007 18:01:24 +1200 Message-ID: <18038.8116.557082.213153@kahikatea.snap.net.nz> References: <6sps3z32ap.fsf@fencepost.gnu.org> <87tztbcue9.fsf@stupidchicken.com> <87lkemmrg4.fsf@stupidchicken.com> <18033.64249.816850.550250@kahikatea.snap.net.nz> <85ejkcq32v.fsf@lola.goethe.zz> <85k5u4nlrh.fsf@lola.goethe.zz> <85ir9lkfhk.fsf@lola.goethe.zz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1182146503 15429 80.91.229.12 (18 Jun 2007 06:01:43 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 18 Jun 2007 06:01:43 +0000 (UTC) Cc: Eli Zaretskii , Kenichi Handa , emacs-devel@gnu.org To: David Kastrup Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jun 18 08:01:41 2007 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.50) id 1I0AJ1-0001Gp-Ue for ged-emacs-devel@m.gmane.org; Mon, 18 Jun 2007 08:01:40 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I0AJ1-0008OV-Bz for ged-emacs-devel@m.gmane.org; Mon, 18 Jun 2007 02:01:39 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1I0AIy-0008OQ-96 for emacs-devel@gnu.org; Mon, 18 Jun 2007 02:01:36 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1I0AIw-0008OE-Ub for emacs-devel@gnu.org; Mon, 18 Jun 2007 02:01:36 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I0AIw-0008OB-OF for emacs-devel@gnu.org; Mon, 18 Jun 2007 02:01:34 -0400 Original-Received: from viper.snap.net.nz ([202.37.101.8]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1I0AIu-0002O0-IF; Mon, 18 Jun 2007 02:01:32 -0400 Original-Received: from kahikatea.snap.net.nz (22.61.255.123.dynamic.snap.net.nz [123.255.61.22]) by viper.snap.net.nz (Postfix) with ESMTP id 98B1A3D9F06; Mon, 18 Jun 2007 18:01:29 +1200 (NZST) Original-Received: by kahikatea.snap.net.nz (Postfix, from userid 1000) id 6989B8FBF6; Mon, 18 Jun 2007 18:01:25 +1200 (NZST) In-Reply-To: <85ir9lkfhk.fsf@lola.goethe.zz> X-Mailer: VM 7.19 under Emacs 22.1.50.3 X-detected-kernel: Linux 2.4-2.6 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:73208 Archived-At: > >> No. I asked to merge unicode-2 into the trunk, but as it > >> was not accepted, I asked not to make heavy changes to the > >> trunk unless one takes care of emacs-unicode-2 branch too. > > > > So in that case, making such changes in the Unicode branch directly, > > as I suggested, would be a good way of installing changes without > > interfering with the future merge, right? > > Could you explain how putting _unrelated_ changes into the Unicode > branch would not interfere with a merge? It makes sense to me: if most changes are in the Unicode branch then if you view it as merging the trunk to the branch, fewer changes need to be made. However, it might be a problem if the changes on the branch break things. So it might be a good idea to branch the branch or at least tag it first as a possible future branchpoint. -- Nick http://www.inet.net.nz/~nickrob