From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: base Date: Thu, 26 Aug 2010 20:08:37 +0300 Message-ID: <83iq2xmhd6.fsf@gnu.org> References: <20100822120642.GA1794@muc.de> <871v9o7dmf.fsf@uwakimon.sk.tsukuba.ac.jp> <87wrrg5rzg.fsf@uwakimon.sk.tsukuba.ac.jp> <87r5ho5gyr.fsf@uwakimon.sk.tsukuba.ac.jp> <87hbij6hib.fsf@uwakimon.sk.tsukuba.ac.jp> <87k4nf7ezq.fsf@catnip.gol.com> <878w3v7dd2.fsf@catnip.gol.com> <83wrrfmljv.fsf@gnu.org> <87d3t75crc.fsf@uwakimon.sk.tsukuba.ac.jp> <87fwy2g7i2.fsf@telefonica.net> <83r5hmmrz0.fsf@gnu.org> <877hjefll8.fsf@telefonica.net> <83mxsam5lh.fsf@gnu.org> <87eidm5a0n.fsf@catnip.gol.com> <87y6bt4p01.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1282842412 1355 80.91.229.12 (26 Aug 2010 17:06:52 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Thu, 26 Aug 2010 17:06:52 +0000 (UTC) Cc: emacs-devel@gnu.org, miles@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Aug 26 19:06:51 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 1Oofuc-000631-Gj for ged-emacs-devel@m.gmane.org; Thu, 26 Aug 2010 19:06:50 +0200 Original-Received: from localhost ([127.0.0.1]:52623 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oofub-0000Il-Qg for ged-emacs-devel@m.gmane.org; Thu, 26 Aug 2010 13:06:49 -0400 Original-Received: from [140.186.70.92] (port=40836 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OofuW-0000HI-Jz for emacs-devel@gnu.org; Thu, 26 Aug 2010 13:06:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OofuV-0002gl-2y for emacs-devel@gnu.org; Thu, 26 Aug 2010 13:06:44 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:44062) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OofuU-0002gX-Pd; Thu, 26 Aug 2010 13:06:43 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0L7R00L00R8PEZ00@a-mtaout23.012.net.il>; Thu, 26 Aug 2010 20:06:41 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.228.186.164]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L7R00LWVRISCM50@a-mtaout23.012.net.il>; Thu, 26 Aug 2010 20:06:30 +0300 (IDT) In-reply-to: <87y6bt4p01.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:129263 Archived-At: > From: "Stephen J. Turnbull" > Cc: Miles Bader , > emacs-devel@gnu.org > Date: Thu, 26 Aug 2010 20:01:02 +0900 > > Eli Zaretskii writes: > > > You are pushing a simple request ad absurdum. I wasn't asking for > > an exhaustive list of _all_possible_ workflows, only for a few > > representative ones. And please don't tell me that's impossible, > > or even hard, because today I can easily do that for Bazaar. > > No, you can provide some representative workflows that are enough for > you. Actually, I meant some representative workflows that should cover the common use-cases. > That's far from providing representative workflows that would be > enough to convince anyone who has actually used git that bzr is a > half-adequate replacement. Indeed, I see no reason to ask for workflows that convince not to use bzr in a project that uses bzr. > For example, suppose I ask, "How do I efficiently switch from one > branch to another in the same directory, like I do in git?" bzr switch THE_OTHER_BRANCH (I have no idea whether this is "like you do in git".) > Or "how do I rebase branch A from the common ancestor with branch B to > the grandparent of the head of branch C, which branched from trunk > before B did?" cd A && bzr rebase --onto=revno:-3 ../C > And for a gold star, tell me whether it matters when B branched from > trunk. I don't see why it should. Although I'm probably missing something in your description, because I don't understand what is B doing in this story. Both A and B branched from the trunk at the same point, right? > > For complex and unconventional workflows, it _might_ be necessary > > to use the history DAG to explain them, but for the common > > workflows even that should not be necessary. > > OK, if it's not necessary, do it. Specifically, explain why pushing > directly from a working branch to the upstream repository "just like > a CVS commit" (which has got to be as simple and conventional as it > gets, right?) is a bad idea in Bazaar. No references to the DAG are > allowed, because they're unnecessary, right? Right. But there's nothing for me to explain here, because it is already explained on the wiki: "it can cause history to be displayed in a strange way in the upstream master, any mirrors or branches of it, and your own branch later." And the mail referenced from there explains more: the revisions from the branch will appear as part of mainline, and mainline will appear as if it were a branch. Note that the acronym DAG is not used anywhere.