From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: Switching to bzr: what Emacs developers should know? Date: Sun, 09 Aug 2009 08:03:49 +0800 Message-ID: <8763cxluoq.fsf@bzg.ath.cx> References: <874osi6zpe.fsf@bzg.ath.cx> <28c656e20908081151h55a4b566v4cfc7c49c5ca2a37@mail.gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1249776258 31603 80.91.229.12 (9 Aug 2009 00:04:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 9 Aug 2009 00:04:18 +0000 (UTC) Cc: emacs-devel@gnu.org To: B Smith-Mannschott Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 09 02:04:10 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 1MZvtR-0000Ud-TT for ged-emacs-devel@m.gmane.org; Sun, 09 Aug 2009 02:04:10 +0200 Original-Received: from localhost ([127.0.0.1]:57376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MZvtR-0005LL-74 for ged-emacs-devel@m.gmane.org; Sat, 08 Aug 2009 20:04:09 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MZvtN-0005LF-5Y for emacs-devel@gnu.org; Sat, 08 Aug 2009 20:04:05 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MZvtI-0005GD-K4 for emacs-devel@gnu.org; Sat, 08 Aug 2009 20:04:04 -0400 Original-Received: from [199.232.76.173] (port=37998 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MZvtI-0005GA-G6 for emacs-devel@gnu.org; Sat, 08 Aug 2009 20:04:00 -0400 Original-Received: from rv-out-0708.google.com ([209.85.198.246]:10523) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MZvtH-0002bz-U0 for emacs-devel@gnu.org; Sat, 08 Aug 2009 20:04:00 -0400 Original-Received: by rv-out-0708.google.com with SMTP id c5so430333rvf.2 for ; Sat, 08 Aug 2009 17:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject :in-reply-to:references:user-agent:date:message-id:mime-version :content-type:content-transfer-encoding; bh=DA1392dNGKEAdnTnOy47VDP4EVvUGm7MOP1Ee5Tl4sk=; b=fSX2edzcBDMZ0cB1aifLrRmh/igr1ZpynhS6dbM/bOvPCtZG949Jf5c0aw/TTaWtki wBHaUnu4wotj50hhiwd5MFvobZCs21tsI/Mwq4EfNXEPi+r6aHJIJT6XD+sj8FJaregT tkrsr9J+hcibctDXC1h/q+XTGX47AzFBiC4nc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type:content-transfer-encoding; b=h9LxRxUfRu2TvTK3NtukCI2ZoMTbBnR/B+8vwv0t/mtxxMZK4Vkr9Af6uYvDbtcbf/ bq7riW+wOy9TIIochGa0/8V/V01l69Af8cWRU+GWnhJzFaeIVVT6bCYw6CtMfkOzomA/ GLdLEdq0ai/ssSjeSEbsX5IHCx0coASxVwHng= Original-Received: by 10.140.204.7 with SMTP id b7mr72950rvg.262.1249776239208; Sat, 08 Aug 2009 17:03:59 -0700 (PDT) Original-Received: from bzg.ath.cx (p4158-ipbf4110marunouchi.tokyo.ocn.ne.jp [123.224.221.158]) by mx.google.com with ESMTPS id g22sm13026077rvb.52.2009.08.08.17.03.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 08 Aug 2009 17:03:58 -0700 (PDT) In-Reply-To: <28c656e20908081151h55a4b566v4cfc7c49c5ca2a37@mail.gmail.com> (B. Smith-Mannschott's message of "Sat, 8 Aug 2009 20:51:31 +0200") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.1 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:113830 Archived-At: B Smith-Mannschott writes: > Presumably, you've seen this, yes?: > http://www.emacswiki.org/emacs/BzrForEmacsDevs > First, initialize a repository in which to store all your branches: > > bzr init-repo --2a emacs/ (I hope we won't need this "--2a" option anytime soon.) > Create a branch that will just be a mirror of the mainline. You’ll > never make any changes to this branch; its job is just to reflect the > upstream master: > > cd emacs/ > bzr branch http://bzr.savannah.gnu.org/sources/emacs/trunk/ trunk/ Is this "trunk" branch necessary, or just a convenience? Why isn't the default branch enough for the trunk-tasks described in this page? > And after refreshing the mirror, you’ll want to get those changes into > your task branch, by merging them: > > cd SOME-TASKNAME/ > bzr merge > bzr commit -m "Merge from mainline." Is this merge happening between the local branch and the trunk or the local branch and the default branch? > If you’re one of the Emacs maintainers, then you can just push it directly to the upstream master: > > bzr push %%bzr+ssh://bzr.savannah.gnu.org/sources/emacs/trunk/%% Any chance to reduce this to "bzr push"? IIUC this sequence will do: ,---- | cd SOME-TASK/ | echo "public_branch = http://bzr.savannah.gnu.org/sources/emacs/trunk" >> .bzr/branch/config | bzr bind http://bzr.savannah.gnu.org/sources/emacs/trunk/ | cd .. `---- Then "bzr push" will push to the public_branch location. Am I right? -- Bastien