From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David De La Harpe Golden Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Tue, 24 Nov 2009 01:19:43 +0000 Message-ID: <4B0B34AF.20400@harpegolden.net> References: <20091118230952.GB908@muc.de> <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> <87zl6fnnu2.fsf@notengoamigos.org> <87aaye3nba.fsf@uwakimon.sk.tsukuba.ac.jp> <87r5rqm7gm.fsf@notengoamigos.org> <87skc5spso.fsf@uwakimon.sk.tsukuba.ac.jp> <87ws1hujh5.fsf@notengoamigos.org> <4B0B1DA6.7030206@harpegolden.net> <87k4xgrdsl.fsf@canonical.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1259025611 27745 80.91.229.12 (24 Nov 2009 01:20:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 24 Nov 2009 01:20:11 +0000 (UTC) Cc: es , "Stephen J. Turnbull" , emacs-devel@gnu.org, Eli Zaretskii , Jason Earl To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 24 02:20:03 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 1NCk4Z-0000CE-15 for ged-emacs-devel@m.gmane.org; Tue, 24 Nov 2009 02:20:03 +0100 Original-Received: from localhost ([127.0.0.1]:51311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCk4Y-00081r-7H for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2009 20:20:02 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCk4R-0007zV-WD for emacs-devel@gnu.org; Mon, 23 Nov 2009 20:19:56 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCk4N-0007tg-3o for emacs-devel@gnu.org; Mon, 23 Nov 2009 20:19:55 -0500 Original-Received: from [199.232.76.173] (port=44012 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCk4M-0007t4-H8 for emacs-devel@gnu.org; Mon, 23 Nov 2009 20:19:50 -0500 Original-Received: from harpegolden.net ([65.99.215.13]:58839) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCk4J-00008L-Tb; Mon, 23 Nov 2009 20:19:48 -0500 Original-Received: from [87.198.54.194] (87-198-54-194.ptr.magnet.ie [87.198.54.194]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "David De La Harpe Golden", Issuer "David De La Harpe Golden Personal CA rev 3" (verified OK)) by harpegolden.net (Postfix) with ESMTP id 094918159; Tue, 24 Nov 2009 01:19:45 +0000 (GMT) User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20091109) In-Reply-To: <87k4xgrdsl.fsf@canonical.com> 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:117654 Archived-At: Karl Fogel wrote: > I may misunderstand the question, but I think this will help you: > Thanks, it's also possible I'm just too confused/tired/dumb to ask a clear question. > * 'bzr push --remember DEST means the next time you can just do > 'bzr push' and it will push to that same DEST. >=20 But not also decide to pull from DEST, right? i.e. it push and pull's --remembers are independent? > * Suppose you have local branch LB, related to (originally branched > from) upstream branch UB. After you send changes from LB to UB, = you > can pull from UB to LB and, of course, it won't send those changes, > because LB already has them. It will send changes LB doesn't have. >=20 That's the thing - Are you skipping a step here? At least, you've got no _manifest_ local mirror of UB. I suppose the data's basically=20 there underneath. Why aren't I implicitly or explicitly making a local=20 remote-tracking branch RB mirroring UB, then local branch LB ? Or=20 alternatively, if LB is the local mirror of UB, why am I sending changes=20 from it - Why am I changing it in the first place? See below. > The question of who is "remote" and who is not depends on point of > view.=20 Well, exactly, hence remote-tracking branches. > See > the oft-referred-to http://www.emacswiki.org/emacs/BzrForEmacsDevs. *** Well, see, that strongly suggests to me the local branch "trunk"=20 _is_ the bzr analog of remote-tracking branch: """Now, create a branch called trunk that will just be a mirror of the=20 mainline. You=92ll never do any development in this branch; its job is=20 just to reflect the upstream master:""" """The --no-tree option prevents an automatic checkout of the source=20 tree. This has two functions. It saves some space. More important, it=20 reduces the temptation to edit sources in this branch to almost nothing=20 =97 so that you don=92t accidentally commit any local changes on it.""" *** Except for the bit where someone ...commits local changes on it...=20 Wait, what? Fortunately, I'm not an upstream committer, I'll presumably be sending=20 or asking upstream committers to pick stuff from my public tree, but=20 still, I'm clearly missing something. """Alternatively, if you are a committer, you may want to push to the=20 upstream master. cd $DEVHOME/emacs/trunk/ bzr pull bzr merge ../quickfixes and then commit bzr commit -m "Merge: fix bla bla bla (closes Bug #1)." which automatically pushes all your new commits to the upstream master,=20 because the mirror is set up as bound branch. """ *** why is this happening on branch trunk and not a branch my-trunk branched from trunk? Can it, say, happen on such a branch=20 my-trunk (not quickfixes, given dire warnings about history messing up=20 if you do that) without ill effect, just to stop my brain hurting? Or is that just as apparently bad as pushing from quickfixes would be?