From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tassilo Horn Newsgroups: gmane.emacs.devel Subject: Re: Bzr help Date: Fri, 20 Dec 2013 19:47:01 +0100 Message-ID: <87ob4bgy1m.fsf@thinkpad.tsdh.org> References: <87wqizbh0j.fsf@thinkpad.tsdh.org> <8338lnbdoe.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1387565232 22656 80.91.229.3 (20 Dec 2013 18:47:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Dec 2013 18:47:12 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 20 19:47:18 2013 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Vu56U-0000Fs-9n for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 19:47:18 +0100 Original-Received: from localhost ([::1]:51383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu56T-0006Fb-VS for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 13:47:17 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu56M-0006F9-9J for emacs-devel@gnu.org; Fri, 20 Dec 2013 13:47:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vu56G-00084K-BS for emacs-devel@gnu.org; Fri, 20 Dec 2013 13:47:10 -0500 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:56211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu56G-000848-3u for emacs-devel@gnu.org; Fri, 20 Dec 2013 13:47:04 -0500 Original-Received: from compute5.internal (compute5.nyi.mail.srv.osa [10.202.2.45]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id A3CDB207D1 for ; Fri, 20 Dec 2013 13:47:03 -0500 (EST) Original-Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Fri, 20 Dec 2013 13:47:03 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:references:date :in-reply-to:message-id:mime-version:content-type; s=smtpout; bh=HUs+7Q/AYANOYzcmMX/ab1uxZi4=; b=HQ46qtWkJdsB41eD1QQQKrABjcLS af6anrsaLe9h/44rBQYjT+sN1QaDe3qNsecN897T7N/xL4TSxOO3yOEFv5RguRZc PETvvvAqxFBlztETezLVtKWvlfY0o0ItySoDw/DQtnMVJcWgHQObN8F5ILQtAlyn JlRC1igLn5fokG4= X-Sasl-enc: 1Rgpgi+8e5MMO21F+3+HWsFudEzECUC9TTeh8QXhKngi 1387565223 Original-Received: from thinkpad.tsdh.org (unknown [91.67.164.26]) by mail.messagingengine.com (Postfix) with ESMTPA id DCA0DC00E8D; Fri, 20 Dec 2013 13:47:02 -0500 (EST) Mail-Followup-To: Eli Zaretskii , emacs-devel@gnu.org In-Reply-To: <8338lnbdoe.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 20 Dec 2013 20:05:53 +0200") User-Agent: Gnus/5.130008 (Ma Gnus v0.8) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.111.4.27 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:166672 Archived-At: Eli Zaretskii writes: >> I've done "bzr pull" and "bzr merge" followed by a "bzr commit". > > That was a mistake: "bzr pull" in a diverged branch doesn't do what > you think it does (bzr is not git). The first line of "bzr help pull" > says: > > Purpose: Turn this branch into a mirror of another branch. > > which is not what you want. > > What you want is "bzr merge" from the remote branch, followed by "bzr > commit". _Then_ you should be able to push. IOW, omit the "bzr pull" > from the sequence of the commands, and you should be fine. Ok, I see. > Having said that, I really don't recommend working from an unbound > branch, it will make things harder for you, due to subtle differences > in semantics of name-sake commands to which you are used to with git. Guessed correctly, though I usually just "git pull --rebase". > Instead, use a bound branch, and the workflow described in > http://www.emacswiki.org/emacs/BzrForEmacsDevs. Yes, I'll do so. > That way, you will have recipes for commands that DTRT. You can use > local branches (described on that page as well), if you prefer that, > and merge onto the bound branch immediately prior to committing > (pushing) upstream. Yes, that seems to be the best solution for how I'm used to work. > Btw, is this the first time you did some local commits and tried to > push? If not, how did your workflow look until now? No, not the first time. I usually just edit, then review/commit with `vc-dir', and then "bzr push" in a console. Up to now, I was just lucky that nobody pushed in between. >> How do I get back into a good, pushable state, preferably without >> losing my commit 115645 (or at least the changes)? (I haven't tried >> pushing in fear of being able to screw things up.) > > I think "bzr uncommit" in your branch will be able to remove all the > mistaken commits you've made, either one by one or all of them at once > (see "bzr help uncommit"). Then start over, this time correctly. To > avoid losing your changes, save them first with "bzr diff -c REVNO", > and then you will be able to reapply them. I simply uncommitting my 3 top-most commits which left me in a state where the original change I wanted to do was the only change in my working copy. So I could just commit them again and push. Thanks for the help, Eli! Tassilo