From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Wed, 25 Nov 2009 18:14:58 -0500 Message-ID: References: <87my2jw05z.fsf@red-bean.com> <83skc9pbf7.fsf@gnu.org> <87iqd5vw5n.fsf@red-bean.com> <877htl53tc.fsf@telefonica.net> <87ws1ku7zd.fsf@red-bean.com> <87hbso4s13.fsf@telefonica.net> <83aaygoy90.fsf@gnu.org> <87vdh36d48.fsf@telefonica.net> <831vjrptha.fsf@gnu.org> <87einr63b6.fsf@telefonica.net> <83y6lzo9e7.fsf@gnu.org> <871vjr750o.fsf@uwakimon.sk.tsukuba.ac.jp> <83tywnnq34.fsf@gnu.org> <873a475bsr.fsf@telefonica.net> <87ocmu7x9c.fsf@red-bean.com> <87zl6crij4.fsf@red-bean.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1259190922 22246 80.91.229.12 (25 Nov 2009 23:15:22 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 25 Nov 2009 23:15:22 +0000 (UTC) Cc: Karl Fogel , ofv@wanadoo.es, emacs-devel@gnu.org To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 26 00:15:15 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 1NDR4r-0002Tt-Db for ged-emacs-devel@m.gmane.org; Thu, 26 Nov 2009 00:15:13 +0100 Original-Received: from localhost ([127.0.0.1]:60129 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDR4q-0007ch-PL for ged-emacs-devel@m.gmane.org; Wed, 25 Nov 2009 18:15:12 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDR4k-0007bG-MM for emacs-devel@gnu.org; Wed, 25 Nov 2009 18:15:06 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDR4f-0007XC-9J for emacs-devel@gnu.org; Wed, 25 Nov 2009 18:15:05 -0500 Original-Received: from [199.232.76.173] (port=49257 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDR4f-0007X9-5f for emacs-devel@gnu.org; Wed, 25 Nov 2009 18:15:01 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:46357 helo=ironport2-out.pppoe.ca) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NDR4d-0004tz-GO; Wed, 25 Nov 2009 18:14:59 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Am8FAMtIDUtFpYc//2dsb2JhbACBTtRHhDIEihY X-IronPort-AV: E=Sophos;i="4.47,288,1257138000"; d="scan'208";a="50042830" Original-Received: from 69-165-135-63.dsl.teksavvy.com (HELO pastel.home) ([69.165.135.63]) by ironport2-out.pppoe.ca with ESMTP; 25 Nov 2009 18:14:58 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 6D0D380E3; Wed, 25 Nov 2009 18:14:58 -0500 (EST) In-Reply-To: (Richard Stallman's message of "Wed, 25 Nov 2009 16:02:44 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:117787 Archived-At: > In other words, after doing > bzr branch URL_TO_UPSTREAM_EMACS_TRUNK > why not just go ahead and edit the files in the directory > for that branch? You can definitely do that. You can then commit those changes locally with "bzr commit", you can fetch updates from the upstream trunk with "bzr merge", you can also install those changes into the upstream trunk with "bzr push". But the main problem with it in my experience is that whenever you want to see the local changes that aren't installed yet, you end up having to do bzr diff -r branch:URL_TO_UPSTREAM_EMACS_TRUNK (which can be shortened to "bzr diff -r submit:") which will need to contact the remote repository and hence won't work when you're not connected; furthermore it will show the diff between your branch and the remote trunk, which will include both your local changes and the changes you haven't fetched from the remote trunk. OTOH with a local mirror of the remote trunk, you can do "bzr diff -r branch:../mirror" (which can also be shortened to "bzr diff -r submit:") and it will work purely locally and (assuming you've done a merge since you last updated that mirror) will only show your local changes. Note that this mirror can be cheap (like 40KB or so of disk space) since it doesn't need to contain the actual files (unless you want them to be there) and your local branch already contains all the needed history info anyway. Stefan