From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Locks on the Bzr repository Date: Sun, 22 Aug 2010 00:38:11 +0200 Message-ID: References: <4C6D56DB.7040703@swipnet.se> <4C6D8EC5.7040901@swipnet.se> <4C6E1F0A.7070506@swipnet.se> <837hjlr78p.fsf@gnu.org> <87zkwhtws5.fsf@uwakimon.sk.tsukuba.ac.jp> <83tymppj62.fsf@gnu.org> <871v9t8klf.fsf@uwakimon.sk.tsukuba.ac.jp> <83lj81pazq.fsf@gnu.org> <83aaogpcbu.fsf@gnu.org> <87vd737pxd.fsf@uwakimon.sk.tsukuba.ac.jp> <83pqxboi38.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 1282430306 22540 80.91.229.12 (21 Aug 2010 22:38:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 Aug 2010 22:38:26 +0000 (UTC) Cc: emacs-devel@gnu.org To: Uday S Reddy Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 22 00:38:25 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.69) (envelope-from ) id 1Omwhi-00041Z-VK for ged-emacs-devel@m.gmane.org; Sun, 22 Aug 2010 00:38:23 +0200 Original-Received: from localhost ([127.0.0.1]:52014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Omwhi-0001Ro-8c for ged-emacs-devel@m.gmane.org; Sat, 21 Aug 2010 18:38:22 -0400 Original-Received: from [140.186.70.92] (port=48105 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Omwhc-0001Qa-Gn for emacs-devel@gnu.org; Sat, 21 Aug 2010 18:38:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Omwhb-0001I3-FB for emacs-devel@gnu.org; Sat, 21 Aug 2010 18:38:16 -0400 Original-Received: from impaqm5.telefonica.net ([213.4.138.5]:33559) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Omwhb-0001Hr-6W for emacs-devel@gnu.org; Sat, 21 Aug 2010 18:38:15 -0400 Original-Received: from IMPmailhost2.adm.correo ([10.20.102.39]) by IMPaqm5.telefonica.net with bizsmtp id xAMv1e00C0r0BT63RAeDYK; Sun, 22 Aug 2010 00:38:13 +0200 Original-Received: from ceviche.home ([83.61.35.93]) by IMPmailhost2.adm.correo with BIZ IMP id xAeB1e00420aCvn1iAeCQV; Sun, 22 Aug 2010 00:38:13 +0200 X-Brightmail-Tracker: AAAAAA== X-TE-authinfo: authemail="monnier$movistar.es" |auth_email="monnier@movistar.es" X-TE-AcuTerraCos: auth_cuTerraCos="cosuitnetc01" Original-Received: by ceviche.home (Postfix, from userid 20848) id CC86C660E9; Sun, 22 Aug 2010 00:38:11 +0200 (CEST) In-Reply-To: (Uday S. Reddy's message of "Sat, 21 Aug 2010 22:51:44 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. 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:129000 Archived-At: > You could try the rebase-based workflow that Stephen outlined in his > message. That won't lump the commits together. The problem with it, is that I've found Bzr's rebase to be unreliable. Stefan