From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: Locks on the Bzr repository Date: Fri, 20 Aug 2010 15:29:40 +0200 Message-ID: References: <4C6D56DB.7040703@swipnet.se> <4C6D8EC5.7040901@swipnet.se> <4C6E1F0A.7070506@swipnet.se> <837hjlr78p.fsf@gnu.org> <83vd75prjf.fsf@gnu.org> <83sk29pj4a.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 1282310999 20092 80.91.229.12 (20 Aug 2010 13:29:59 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Fri, 20 Aug 2010 13:29:59 +0000 (UTC) Cc: jan.h.d@swipnet.se, monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 20 15:29:58 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 1OmRfQ-0004fE-G1 for ged-emacs-devel@m.gmane.org; Fri, 20 Aug 2010 15:29:56 +0200 Original-Received: from localhost ([127.0.0.1]:54573 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmRfP-0000iR-QE for ged-emacs-devel@m.gmane.org; Fri, 20 Aug 2010 09:29:55 -0400 Original-Received: from [140.186.70.92] (port=58686 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OmRfG-0000hB-Dw for emacs-devel@gnu.org; Fri, 20 Aug 2010 09:29:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OmRfF-0001o5-Fm for emacs-devel@gnu.org; Fri, 20 Aug 2010 09:29:46 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:50636) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OmRfD-0001nP-Qw; Fri, 20 Aug 2010 09:29:43 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 28B771C001DF; Fri, 20 Aug 2010 15:29:40 +0200 (CEST) Original-Received: from hase.home (ppp-88-217-127-212.dynamic.mnet-online.de [88.217.127.212]) by mail.mnet-online.de (Postfix) with ESMTP id 7DD9D1C00256; Fri, 20 Aug 2010 15:29:40 +0200 (CEST) X-Yow: CHUBBY CHECKER owns my BUILDING! In-Reply-To: <83sk29pj4a.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 20 Aug 2010 15:24:21 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:128921 Archived-At: Eli Zaretskii writes: > IIUC, if you resync with the master repo with "bzr merge", your local > commits will appear on a branch when you push. Did I write "bzr merge" anywhere? Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."