From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/76417 Path: news.gmane.org!not-for-mail From: "Stephen J. Turnbull" Newsgroups: gmane.emacs.devel,gmane.emacs.gnus.general Subject: Re: Gnus overrides.texi and WEBHACKDEVEL Date: Mon, 07 Feb 2011 02:52:45 +0900 Message-ID: <874o8h124y.fsf@uwakimon.sk.tsukuba.ac.jp> References: <83ei7makon.fsf@gnu.org> <838vxuaek9.fsf@gnu.org> <877hdebm01.fsf_-_@lifelogs.com> <831v3ma532.fsf@gnu.org> <8739o2bjci.fsf@lifelogs.com> <83wrle8p8q.fsf@gnu.org> <87lj1t1wuz.fsf@uwakimon.sk.tsukuba.ac.jp> <878vxt1b1i.fsf@uwakimon.sk.tsukuba.ac.jp> <83d3n5t6wp.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1297015332 29100 80.91.229.12 (6 Feb 2011 18:02:12 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 6 Feb 2011 18:02:12 +0000 (UTC) Cc: tzz@lifelogs.com, ding@gnus.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 06 19:02:06 2011 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 1Pm8w1-0000KU-2w for ged-emacs-devel@m.gmane.org; Sun, 06 Feb 2011 19:02:05 +0100 Original-Received: from localhost ([127.0.0.1]:39749 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pm8w0-0008Jt-AQ for ged-emacs-devel@m.gmane.org; Sun, 06 Feb 2011 13:02:04 -0500 Original-Received: from [140.186.70.92] (port=52993 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pm8vv-0008JW-EW for emacs-devel@gnu.org; Sun, 06 Feb 2011 13:02:00 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pm8vu-0008Pn-4H for emacs-devel@gnu.org; Sun, 06 Feb 2011 13:01:59 -0500 Original-Received: from mgmt2.sk.tsukuba.ac.jp ([130.158.97.224]:44468) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pm8vs-0008PI-7d; Sun, 06 Feb 2011 13:01:56 -0500 Original-Received: from uwakimon.sk.tsukuba.ac.jp (uwakimon.sk.tsukuba.ac.jp [130.158.99.156]) by mgmt2.sk.tsukuba.ac.jp (Postfix) with ESMTP id 6AFED97068F; Mon, 7 Feb 2011 03:01:52 +0900 (JST) Original-Received: by uwakimon.sk.tsukuba.ac.jp (Postfix, from userid 1000) id A55C11A2C59; Mon, 7 Feb 2011 02:52:45 +0900 (JST) In-Reply-To: <83d3n5t6wp.fsf@gnu.org> X-Mailer: VM undefined under 21.5 (beta29) "garbanzo" ed3b274cc037 XEmacs Lucid (x86_64-unknown-linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 130.158.97.224 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:135651 gmane.emacs.gnus.general:76417 Archived-At: Eli Zaretskii writes: > So what workflow will avoid this danger? Can you show the commands in > that workflow for when a changeset is ready to be committed to the > master repo? I don't have the time to figure that out (I don't use Bazaar heavily enough to remember the details of the commands, nor do I remember the details of the workflow in question). But it's a simple, generic observation: if you have some changes that should be pushed, and others (that may be worth preserving) that should not be pushed, use a branch to work in. Then cherrypick the changes to your integration workspace (which can be a branch or a checkout). Finally push the commits from the integration workspace. Another possibility would be use of pipelines or looms (but I can't help you there at all, I've never used either). I presume both of those depend on having a true branch, as well, but they are designed for "work in the integration branch".