From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: Avoiding slowdown in trunk development Date: Wed, 02 Feb 2011 11:52:45 -0500 Message-ID: <878vxy1iqq.fsf@stupidchicken.com> References: <4D45F788.1020101@cs.ucla.edu> <83r5btg1td.fsf@gnu.org> <4D466C8D.2020102@cs.ucla.edu> <4D473584.6010205@cs.ucla.edu> <838vy0flgh.fsf@gnu.org> <4D47B17C.6080201@cs.ucla.edu> <4D48594C.3070900@cs.ucla.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1296673532 32320 80.91.229.12 (2 Feb 2011 19:05:32 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 2 Feb 2011 19:05:32 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Feb 02 20:05:28 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 1Pki17-0000xG-DO for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 20:05:25 +0100 Original-Received: from localhost ([127.0.0.1]:41048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pki15-0006Nz-IQ for ged-emacs-devel@m.gmane.org; Wed, 02 Feb 2011 14:05:23 -0500 Original-Received: from [140.186.70.92] (port=40733 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pkfws-00037G-Pm for emacs-devel@gnu.org; Wed, 02 Feb 2011 11:52:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pkfwn-00058q-5k for emacs-devel@gnu.org; Wed, 02 Feb 2011 11:52:54 -0500 Original-Received: from vm-emlprdomr-04.its.yale.edu ([130.132.50.145]:38014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pkfwn-00058b-3I; Wed, 02 Feb 2011 11:52:49 -0500 Original-Received: from furball (dhcp128036014242.central.yale.edu [128.36.14.242]) (authenticated bits=0) by vm-emlprdomr-04.its.yale.edu (8.14.4/8.14.4) with ESMTP id p12Gqk21011046 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 2 Feb 2011 11:52:46 -0500 Original-Received: by furball (Postfix, from userid 1000) id 04B5216058F; Wed, 2 Feb 2011 11:52:45 -0500 (EST) In-Reply-To: <4D48594C.3070900@cs.ucla.edu> (Paul Eggert's message of "Tue, 01 Feb 2011 11:04:44 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-Scanned-By: MIMEDefang 2.71 on 130.132.50.145 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 130.132.50.145 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:135478 Archived-At: Paul Eggert writes: >>> > if that commit fails due to a nearly-simultaneous >>> > trunk commit by someone else, I typically just revert my copy of the >>> > trunk and start over. >> I hope by "revert" you meant "bzr up", not "bzr revert". The short >> time window for the kind of race condition that could happen in this >> situation will rarely cause changes in parts that are related to your >> changes. > > Near-simultaneous changes have caused problems for me. > bzr may be good at merging, but its errors are common enough to be of > concern to me. So I take a more cautious approach using "bzr revert". > This approach has not caused problems. For stuff like the gnulib merge, it would be easier for you to work in a branch. No need to worry about using "bzr revert". If I'd realized the gnulib changes would have broken the Windows build for so long, I would have recommended doing them in a branch on savannah.gnu.org first. Then Eli could have fixed the Windows compilation problems in the branch, before the new code was merged into the trunk.