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: Bzr help Date: Fri, 20 Dec 2013 17:53:48 +0100 Message-ID: <87wqizbh0j.fsf@thinkpad.tsdh.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1387558439 6112 80.91.229.3 (20 Dec 2013 16:53:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Dec 2013 16:53:59 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 20 17:54:06 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 1Vu3Kv-0004Jk-5Q for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 17:54:05 +0100 Original-Received: from localhost ([::1]:50637 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu3Ku-0003PP-Rt for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 11:54:04 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu3Km-0003PI-Eq for emacs-devel@gnu.org; Fri, 20 Dec 2013 11:54:01 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vu3Kh-0005fA-Ld for emacs-devel@gnu.org; Fri, 20 Dec 2013 11:53:56 -0500 Original-Received: from out3-smtp.messagingengine.com ([66.111.4.27]:46028) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vu3Kh-0005ex-DR for emacs-devel@gnu.org; Fri, 20 Dec 2013 11:53:51 -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 D82BB20CD7 for ; Fri, 20 Dec 2013 11:53:50 -0500 (EST) Original-Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Fri, 20 Dec 2013 11:53:50 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:subject:date:message-id :mime-version:content-type; s=smtpout; bh=2sr65Dkzmk0c4mgBID1A1s 3y0HU=; b=ciuTTNGQPcKTDq3UkpW6bRlxOpsHTBO/jgTVeW247RKE1WHzVnwvQ2 DkrzKUwEeP19+em8UJJztBNDkO4OvUxOAjyRsVRLtW1nusOWfrE7vXEnIjfb7URT Wa6NtniSxzjFdKMGlSENjjTVhoBw9+u0FuE20B5LH+hfADuxf6k2c= X-Sasl-enc: TfzOMq72Qa+5JQDOE0Dqs/b9SbxcJvhsMTJZTdm3Cyec 1387558429 Original-Received: from thinkpad.tsdh.org (unknown [91.67.164.26]) by mail.messagingengine.com (Postfix) with ESMTPA id BDB4AC00E93 for ; Fri, 20 Dec 2013 11:53:49 -0500 (EST) Mail-Followup-To: emacs-devel@gnu.org 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:166665 Archived-At: Hi all, it seems I've done something wrong, and now I've messed up my checkout a bit. I've been documenting another item from etc/NEWS, and committed my changes (no bound branch). When I wanted to bzr push, I got a message that the branches have diverged. I've done "bzr pull" and "bzr merge" followed by a "bzr commit". When I wanted to push then, I got: --8<---------------cut here---------------start------------->8--- Using saved push location: bzr+ssh://tsdh@bzr.savannah.gnu.org/emacs/trunk/ bzr: ERROR: Server sent an unexpected error: ('error', 'AppendRevisionsOnlyViolation', 'Operation denied because it would change the main history, which is not permitted by the append_revisions_only setting on branch "filtered-172644364:///emacs/trunk/".') --8<---------------cut here---------------end--------------->8--- With "bzr log" I can see that the commit in between (Bozhidar's rename of helpers.el to subr-x.el) isn't there separately but it seems like I've done that myself! --8<---------------cut here---------------start------------->8--- % bzr log --verbose ------------------------------------------------------------ revno: 115646 [merge] committer: Tassilo Horn branch nick: trunk timestamp: Fri 2013-12-20 17:28:07 +0100 message: merge with trunk removed: lisp/emacs-lisp/helpers.el added: lisp/emacs-lisp/subr-x.el modified: etc/NEWS lisp/ChangeLog ------------------------------------------------------------ revno: 115645 committer: Tassilo Horn branch nick: trunk timestamp: Fri 2013-12-20 17:24:41 +0100 message: Document that =, <, <=, >, >= now accept one or many arguments. * doc/lispref/numbers.texi (numbers): Document that =, <, <=, >, >= now accept one or many arguments. modified: doc/lispref/ChangeLog doc/lispref/numbers.texi etc/NEWS ------------------------------------------------------------ --8<---------------cut here---------------end--------------->8--- "bzr missing" now shows me Bozhidar's commit. --8<---------------cut here---------------start------------->8--- You are missing 1 revision: ------------------------------------------------------------ revno: 115646 committer: Bozhidar Batsov branch nick: master timestamp: Fri 2013-12-20 18:37:10 +0200 message: * lisp/emacs-lisp/subr-x.el: (string-remove-prefix): New function. (string-remove-suffix): New function. --8<---------------cut here---------------end--------------->8--- Ups, I've thought another "bzr merge" and "bzr commit" would probably work, but now I have two merge commits on top. --8<---------------cut here---------------start------------->8--- ------------------------------------------------------------ revno: 115647 [merge] committer: Tassilo Horn branch nick: trunk timestamp: Fri 2013-12-20 17:43:23 +0100 message: merge again modified: etc/NEWS lisp/ChangeLog lisp/emacs-lisp/subr-x.el ------------------------------------------------------------ revno: 115646 [merge] committer: Tassilo Horn branch nick: trunk timestamp: Fri 2013-12-20 17:28:07 +0100 message: merge with trunk removed: lisp/emacs-lisp/helpers.el added: lisp/emacs-lisp/subr-x.el modified: etc/NEWS lisp/ChangeLog ------------------------------------------------------------ revno: 115645 committer: Tassilo Horn branch nick: trunk timestamp: Fri 2013-12-20 17:24:41 +0100 message: Document that =, <, <=, >, >= now accept one or many arguments. * doc/lispref/numbers.texi (numbers): Document that =, <, <=, >, >= now accept one or many arguments. modified: doc/lispref/ChangeLog doc/lispref/numbers.texi etc/NEWS --8<---------------cut here---------------end--------------->8--- Now "bzr missing" tells me I have 3 extra revisions. It doesn't complain anymore about Bozhidar's commit missing, although that's still missing from the log. 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.) And what did I do wrong in the first place? Thanks, Tassilo