From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel,gmane.emacs.gnus.general Subject: Re: Gnus overrides.texi and WEBHACKDEVEL Date: Sun, 06 Feb 2011 20:50:46 +0200 Message-ID: <838vxtt2t5.fsf@gnu.org> 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> <874o8h124y.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1297018261 10656 80.91.229.12 (6 Feb 2011 18:51:01 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 6 Feb 2011 18:51:01 +0000 (UTC) Cc: tzz@lifelogs.com, ding@gnus.org, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 06 19:50:57 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 1Pm9hE-0007GE-4u for ged-emacs-devel@m.gmane.org; Sun, 06 Feb 2011 19:50:52 +0100 Original-Received: from localhost ([127.0.0.1]:42452 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pm9hD-0006hS-R1 for ged-emacs-devel@m.gmane.org; Sun, 06 Feb 2011 13:50:51 -0500 Original-Received: from [140.186.70.92] (port=40063 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pm9h6-0006fQ-74 for emacs-devel@gnu.org; Sun, 06 Feb 2011 13:50:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pm9h1-0000E4-Gv for emacs-devel@gnu.org; Sun, 06 Feb 2011 13:50:43 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:49261) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pm9h1-0000Dx-AQ for emacs-devel@gnu.org; Sun, 06 Feb 2011 13:50:39 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0LG700L00LND1Z00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sun, 06 Feb 2011 20:50:36 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.229.171.5]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LG700J5BLOAVPE0@a-mtaout22.012.net.il>; Sun, 06 Feb 2011 20:50:36 +0200 (IST) In-reply-to: <874o8h124y.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-Received-From: 80.179.55.172 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:135652 gmane.emacs.gnus.general:76420 Archived-At: > From: "Stephen J. Turnbull" > Cc: tzz@lifelogs.com, > ding@gnus.org, > emacs-devel@gnu.org > Date: Mon, 07 Feb 2011 02:52:45 +0900 > > 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. If this is what you had in mind, then it's still manual work, and thus prone to errors. I can do the same in a bound branch with "bzr ci FILE1 FILE2 ...", thus "cherrypicking" only what should be pushed. The original problem was that some people do not pay attention to what "bzr status" says, and just do a "bzr ci", which pushes all the modified files. I guess there's no way around vigilance. Which is fine with me. Thanks.