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: Git to Bzr - what works? Date: Fri, 17 Aug 2012 09:32:38 +0300 Message-ID: <838vdeav09.fsf@gnu.org> References: <5029AB54.8020804@dancol.org> <83fw7pjqav.fsf@gnu.org> <83obmcuk3k.fsf@gnu.org> <838vdevp1f.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1345185206 1633 80.91.229.3 (17 Aug 2012 06:33:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 17 Aug 2012 06:33:26 +0000 (UTC) Cc: emacs-devel@gnu.org To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 17 08:33:26 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1T2G7Z-0002ut-D9 for ged-emacs-devel@m.gmane.org; Fri, 17 Aug 2012 08:33:25 +0200 Original-Received: from localhost ([::1]:56998 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T2G7Y-0003vy-Av for ged-emacs-devel@m.gmane.org; Fri, 17 Aug 2012 02:33:24 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:57873) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T2G7W-0003vt-B7 for emacs-devel@gnu.org; Fri, 17 Aug 2012 02:33:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T2G7V-00080q-5B for emacs-devel@gnu.org; Fri, 17 Aug 2012 02:33:22 -0400 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:38838) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T2G7U-00080b-T7 for emacs-devel@gnu.org; Fri, 17 Aug 2012 02:33:21 -0400 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0M8V00400ZCOT800@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Fri, 17 Aug 2012 09:32:28 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M8V00429ZI4MSA0@a-mtaout21.012.net.il>; Fri, 17 Aug 2012 09:32:28 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:152602 > From: John Wiegley > Date: Thu, 16 Aug 2012 17:12:26 -0500 > > >>>>> Eli Zaretskii writes: > > > I think you will be much better off using Oscar's advice: using a non-bound > > bzr branch where you can commit locally at will and push upstream only when > > you decide to do so. That should allow you a workflow that is largely > > mechanic and does not require to rewire your brain for bzr. > > What commands should I run at terminal to create this probably unbound branch? If you have a Savannah user name: bzr branch bzr+ssh://eliz@bzr.savannah.gnu.org/emacs/trunk/ If you don't: bzr branch bzr://bzr.savannah.gnu.org/emacs/trunk If you already have a bound branch, you can either create a local branch from it: cd /path/to/emacs/trunk/.. bzr branch emacs-local (then do most of your work in emacs-local and push from there) or simply unbind the bound branch: cd /path/to/emacs/trunk bzr unbind The last two are much faster than the other two, because an initial branch pulls the entire history of the development through the wire. I think having a local branch in addition to the bound branch is better, as you get to benefit from both of the worlds. So the 3rd command above is what I'd recommend.