From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sam Steingold Newsgroups: gmane.emacs.devel Subject: Re: bzr workflow Date: Mon, 11 Jan 2010 16:57:25 -0500 Message-ID: <1f77704b1001111357l29886b88oaf1da0ddbb12db62@mail.gmail.com> References: <4B4B93AB.3030903@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1263247150 16450 80.91.229.12 (11 Jan 2010 21:59:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Jan 2010 21:59:10 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 11 22:59:02 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.50) id 1NUSHs-0004el-4F for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2010 22:59:00 +0100 Original-Received: from localhost ([127.0.0.1]:37862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUSHs-0003lw-Tx for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2010 16:59:00 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUSGV-0003BD-0u for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:57:35 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUSGQ-00039e-Ff for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:57:34 -0500 Original-Received: from [199.232.76.173] (port=54571 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUSGQ-00039X-AA for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:57:30 -0500 Original-Received: from mail-yw0-f177.google.com ([209.85.211.177]:36154) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUSGP-0007lM-Uf for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:57:30 -0500 Original-Received: by ywh7 with SMTP id 7so14015311ywh.24 for ; Mon, 11 Jan 2010 13:57:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:received:in-reply-to :references:date:x-google-sender-auth:message-id:subject:from:to:cc :content-type:content-transfer-encoding; bh=KpqgBUkRMK5Dr1nISaYfGu02i0hQUIhod3IN0WOv/4g=; b=lRfvdZYDq/zboP4Kp36TYTQ6UIrFm94R2kdMl4TEZWo9un28wyM4xo4Vmpmgylf0XG duGGAr0btJNJhfI9gRQUvw2AiN99eRCkFWqvM0DR0yuEwscX2Z6Zj7U8rUKotMVZ8wmn jzXr7TO+gCM8zuiLR0m4rRvlf+RYaDKrWJ+2E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=r7b3nS52cj61uqx89vgbdibb5vI7Nej8pYxuOqNuyIAWfKdNb4CXlA+ebvCMBw6eKO NLCd6H0f7e/hr7KORIg9zR03595+X4HC628izJ55sqLFErH/ivhZtMsgBqPX3OCFZe1i 5Au1jejYKC4MvyovomzfhFI47OVixvczIFAK4= Original-Received: by 10.150.105.3 with SMTP id d3mr10725334ybc.293.1263247045349; Mon, 11 Jan 2010 13:57:25 -0800 (PST) In-Reply-To: X-Google-Sender-Auth: 490b6eb4879951cd 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:119833 Archived-At: On 1/11/10, Andreas Schwab wrote: > Sam Steingold writes: > > > 1. Am I the only one who thinks this is a little too convoluted? (the = only > > other DVC I regularly use is hg, and there the workflow is "commit+pus= h" > > instead of the recommended emacs workflow "commit+merge+commit"). > > > Nothing stops you from using the more advanced workflow. what "more advanced workflow"? http://www.emacswiki.org/emacs/BzrForEmacsDevs It might occur to you to save some effort by just doing bzr push directly to the upstream master from inside the quickfixes branch: cd $DEVHOME/emacs/quickfixes bzr push sftp://USERNAME@bzr.savannah.gnu.org/srv/bzr/emacs/trunk/ Do not do this =E2=80=94 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. Search for the word =E2=80=9Chidden=E2=80=9D in this mail for= more details. --=20 Sam Steingold