From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: CHENG Gao Newsgroups: gmane.emacs.devel Subject: Re: Subdir lisp/toolbar - should it be moved into etc/? Date: Fri, 16 Nov 2007 22:20:19 +0800 Organization: cyberhut.org Message-ID: References: <87wssjsxdv.fsf@news.cyberhut.org> <18236.11074.142867.661238@kahikatea.snap.net.nz> <6de468cd0711150336t60f21856wfd965f1a744dbc5a@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1195222936 14948 80.91.229.12 (16 Nov 2007 14:22:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 16 Nov 2007 14:22:16 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 16 15:22:22 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 1It25J-0006La-V3 for ged-emacs-devel@m.gmane.org; Fri, 16 Nov 2007 15:22:18 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1It256-00035F-Ql for ged-emacs-devel@m.gmane.org; Fri, 16 Nov 2007 09:22:04 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1It252-00034c-Ih for emacs-devel@gnu.org; Fri, 16 Nov 2007 09:22:00 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1It250-000341-Ir for emacs-devel@gnu.org; Fri, 16 Nov 2007 09:21:59 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1It250-00033w-BV for emacs-devel@gnu.org; Fri, 16 Nov 2007 09:21:58 -0500 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1It250-0004gB-5n for emacs-devel@gnu.org; Fri, 16 Nov 2007 09:21:58 -0500 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1It24Z-0002GW-RB for emacs-devel@gnu.org; Fri, 16 Nov 2007 14:21:31 +0000 Original-Received: from 222.94.199.143 ([222.94.199.143]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 16 Nov 2007 14:21:31 +0000 Original-Received: from chenggao by 222.94.199.143 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 16 Nov 2007 14:21:31 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 25 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 222.94.199.143 User-Agent: Gnus/5.110007 (No Gnus v0.7) Emacs/23.0.0 (darwin) Cancel-Lock: sha1:VXCln3fLHQAdj67E3kYGJHSWi0E= X-detected-kernel: by monty-python.gnu.org: Linux 2.6, seldom 2.4 (older, 4) 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:83344 Archived-At: *On Fri, 16 Nov 2007 11:34:03 +0100 * Also sprach Andreas Schwab : > "CHENG Gao" writes: > >> Mea culpa. >> I use git repo, and did >> git checkout -b my-emacs23 origin/emacs-unicode-2 > > git checkout --track -b .... > > (or git config branch.autosetupmerge true) > > Andreas. Thanks for the tip. I removed and recreated local branch from origin/emacs-unicode-2 and dir toolbar is still in lisp/. So seems emacs-unicode-2 branch in git repo is not in sync with cvs source. Anyway it does not matter since I can use cvs source. -- Nosce te ipsum