From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kenichi Handa Newsgroups: gmane.emacs.devel Subject: Re: Changes to emacs-23 branch and the trunk Date: Tue, 31 Aug 2010 20:44:20 +0900 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1283255081 9307 80.91.229.12 (31 Aug 2010 11:44:41 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 31 Aug 2010 11:44:41 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 31 13:44:40 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 1OqPGX-000782-Tb for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 13:44:38 +0200 Original-Received: from localhost ([127.0.0.1]:33475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqPGX-0006ce-FL for ged-emacs-devel@m.gmane.org; Tue, 31 Aug 2010 07:44:37 -0400 Original-Received: from [140.186.70.92] (port=33601 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OqPGQ-0006cW-GX for emacs-devel@gnu.org; Tue, 31 Aug 2010 07:44:31 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OqPGO-0004QL-RT for emacs-devel@gnu.org; Tue, 31 Aug 2010 07:44:30 -0400 Original-Received: from mx1.aist.go.jp ([150.29.246.133]:52670) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OqPGO-0004PB-CH for emacs-devel@gnu.org; Tue, 31 Aug 2010 07:44:28 -0400 Original-Received: from rqsmtp2.aist.go.jp (rqsmtp2.aist.go.jp [150.29.254.123]) by mx1.aist.go.jp with ESMTP id o7VBiMRm003838; Tue, 31 Aug 2010 20:44:22 +0900 (JST) env-from (handa@m17n.org) Original-Received: from smtp2.aist.go.jp by rqsmtp2.aist.go.jp with ESMTP id o7VBiL5C003856; Tue, 31 Aug 2010 20:44:21 +0900 (JST) env-from (handa@m17n.org) Original-Received: by smtp2.aist.go.jp with ESMTP id o7VBiLli028555; Tue, 31 Aug 2010 20:44:21 +0900 (JST) env-from (handa@m17n.org) Original-Received: from handa by etlken with local (Exim 4.71) (envelope-from ) id 1OqPGG-00005Y-UR; Tue, 31 Aug 2010 20:44:20 +0900 In-Reply-To: (message from Stefan Monnier on Tue, 31 Aug 2010 10:43:18 +0200) X-detected-operating-system: by eggs.gnu.org: Solaris 9 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:129493 Archived-At: In article , Stefan Monnier writes: > > So to apply your procedure in the above model, what I should > > do is this, right? > > A % cd work-23 > > > > % bzr commit -m 'my change' > > % cd ../emacs-23 > > B % bzr up > > > > C % bzr merge ../work-23 > > % bzr commit -m 'my change' > > % cd ../work > > % bzr merge ../emacs-23 > > > > % bzr commit -m "Merge by hand from emacs-23" > > % cd ../trunk > > % bzr up > > > > % bzr commit -m "Merge by hand from emacs-23" > That looks right, yes, except for a missing "bzr merge ../work" before > the last commit. Ah, sure, I forgot to write that step. But, I've just proceeded to "% bzr merge ../emacs-23", and this message was shown: [work] bzr merge ../emacs-23 M doc/man/ChangeLog M doc/man/emacs.1 M doc/misc/ChangeLog M etc/ChangeLog M etc/emacs3.py M leim/ChangeLog M leim/quail/japanese.el M lisp/ChangeLog M lisp/disp-table.el M lisp/international/mule-cmds.el M lisp/net/rcirc.el M lisp/net/tramp-cmds.el M lisp/net/tramp-compat.el M lisp/net/tramp-fish.el M lisp/net/tramp-ftp.el M lisp/net/tramp-gvfs.el M lisp/net/tramp-imap.el M lisp/net/tramp-smb.el M lisp/net/tramp-uu.el M lisp/net/trampver.el M lisp/play/cookie1.el M lisp/progmodes/python.el M lisp/simple.el M src/ChangeLog M src/dispextern.h M src/term.c M src/xdisp.c Text conflict in doc/misc/ChangeLog Text conflict in etc/ChangeLog Text conflict in lisp/ChangeLog Text conflict in lisp/net/rcirc.el Text conflict in src/ChangeLog Text conflict in src/xdisp.c 6 conflicts encountered. This is strange. The above step apparently merged more than what I committed in emacs-23 branch. That commit was done as this just before the above merge: [emacs-23] bzr commit -m 'Fix handling of 8-bit characters in a display table.' Committing to: sftp://bzr.savannah.gnu.org/srv/bzr/emacs/emacs-23/ modified lisp/ChangeLog modified lisp/disp-table.el modified lisp/international/mule-cmds.el modified src/ChangeLog modified src/dispextern.h modified src/term.c modified src/xdisp.c Committed revision 100011. What was wrong? --- Kenichi Handa handa@m17n.org