From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: grischka Newsgroups: gmane.emacs.devel Subject: Re: Making the tarball with bzr data (was: bzr repository ready?) Date: Mon, 30 Nov 2009 19:11:27 +0100 Message-ID: <4B140ACF.9090808@gmx.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1259607422 28708 80.91.229.12 (30 Nov 2009 18:57:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 30 Nov 2009 18:57:02 +0000 (UTC) Cc: emacs-devel@gnu.org To: lennart.borgman@gmail.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 30 19:56:55 2009 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 1NFBQc-0008GS-Ex for ged-emacs-devel@m.gmane.org; Mon, 30 Nov 2009 19:56:54 +0100 Original-Received: from localhost ([127.0.0.1]:35936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFBQc-0003IS-8n for ged-emacs-devel@m.gmane.org; Mon, 30 Nov 2009 13:56:54 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFAjH-00022n-83 for emacs-devel@gnu.org; Mon, 30 Nov 2009 13:12:07 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFAjC-0001zL-FA for emacs-devel@gnu.org; Mon, 30 Nov 2009 13:12:06 -0500 Original-Received: from [199.232.76.173] (port=41929 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFAjC-0001zF-5U for emacs-devel@gnu.org; Mon, 30 Nov 2009 13:12:02 -0500 Original-Received: from mail.gmx.net ([213.165.64.20]:34498) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1NFAjB-0001jW-Om for emacs-devel@gnu.org; Mon, 30 Nov 2009 13:12:02 -0500 Original-Received: (qmail invoked by alias); 30 Nov 2009 18:11:58 -0000 Original-Received: from p57A0A48B.dip0.t-ipconnect.de (EHLO [192.168.1.2]) [87.160.164.139] by mail.gmx.net (mp038) with SMTP; 30 Nov 2009 19:11:58 +0100 X-Authenticated: #18588216 X-Provags-ID: V01U2FsdGVkX19sDhFPJapsylwsTbqi8+mw7mQeGnUgYVpzfnrL6T YdQw6ylzh/1fM0 User-Agent: Thunderbird 2.0.0.23 (Windows/20090812) Original-References: e01d8a50911300834x701bf526ucb4f8de87b4ded97@mail.gmail.com X-Y-GMX-Trusted: 0 X-FuHaFi: 0.71 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:117980 Archived-At: > If I already have all the Emacs files locally (possibly with some > changes) how do I do to make this a bazaar thing? (This must be the > most common situation, or?) In any case you need to get the official emacs bazaar repository first. If you have personal changes, create a branch. Then, either: 1) copy your changed files over the ones in that branch 2) commit the resulting change as one single patch. Or, if you have more than one change and want to have separate commits for each, use a merge tool such as WinMerge: 1) compare your directory tree with the new development branch 2) For each feature: - copy the relevant chunks that affect the feature - commit with some message - repeat 2) until no differences are left. Then you could publish your branch for others to test or improve. HTH, grischka