From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: Help me unstick my bzr, please. Date: Sat, 16 Jan 2010 22:32:49 +0100 Message-ID: References: <20100115222724.GB1931@muc.de> <838wbycqc2.fsf@gnu.org> <20100116212708.GA6676@muc.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1263677609 22944 80.91.229.12 (16 Jan 2010 21:33:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 Jan 2010 21:33:29 +0000 (UTC) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 16 22:33:21 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.50) id 1NWGGn-0004dN-GC for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 22:33:21 +0100 Original-Received: from localhost ([127.0.0.1]:55246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWGGo-0005iI-C2 for ged-emacs-devel@m.gmane.org; Sat, 16 Jan 2010 16:33:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NWGGj-0005hm-3t for emacs-devel@gnu.org; Sat, 16 Jan 2010 16:33:17 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NWGGe-0005gE-Fx for emacs-devel@gnu.org; Sat, 16 Jan 2010 16:33:16 -0500 Original-Received: from [199.232.76.173] (port=58038 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NWGGe-0005gA-CO for emacs-devel@gnu.org; Sat, 16 Jan 2010 16:33:12 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:37315) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NWGGc-00007K-Cc; Sat, 16 Jan 2010 16:33:10 -0500 Original-Received: by bwz7 with SMTP id 7so1430887bwz.26 for ; Sat, 16 Jan 2010 13:33:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=Kt/grO8GKcfTLOnYmdgdDagsFU5ViYRPvd7970Pz//A=; b=aixDEo8N+oDV3LH77Vspq+cuOycAWtse7MCvX8xjhAspAqfFSzs5cQVh1tiy8bGMjs VRGnBvYWxtRuQjj1Q95C4wZgfiq+g+8tXcW4WrORCiLGSYe8xN0mgECHcu/7NyIu9i9E n8SwicyP9h2VxbiF2s8+lK6gUIl+ZULfpnYmM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=T9Rsbmp+a4inCf2C1tpgmGV2BO61xoubGBamL5KsOEcmLo+Zr5DmUwSNzpZ40Vr8Go x7dyxlRPtUvMxaSXJpuAtmQgwibYlr19EJ9JdBPtDbUxH3xUNhGeL9VTM8l0UAnuoYMP BinY5r9UoRxUegXrcloZPRa29Nb860hpOWDa8= Original-Received: by 10.204.36.199 with SMTP id u7mr2319953bkd.212.1263677589132; Sat, 16 Jan 2010 13:33:09 -0800 (PST) In-Reply-To: <20100116212708.GA6676@muc.de> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:120128 Archived-At: On Sat, Jan 16, 2010 at 22:27, Alan Mackenzie wrote: > My mistake was I tried to move my changes from "quickfixes" to "trunk" > using "bzr merge". =C2=A0'bzr help merge' doesn't say what is merged with= what > where, sadly. You said: > I attempt to merge the change into my "trunk" branch by doing this: > > ~/emacs/emacs.bzr/quickfixes$ bzr merge which is the wrong way. If you want to merge changes *from* a branch *into* trunk, you should do cd trunk bzr update # to make sure trunk is up to date bzr merge ../quickfixes # or the task branch, etc. > I think what I really want is 'bzr push'. =C2=A0Is this correct? No. > The documentation for 'bzr push' is not helpful. Sadly true. Juanma