From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: Moving Emacs 24.3 development to emacs-24 branch soon Date: Thu, 01 Nov 2012 21:58:35 +0800 Message-ID: <874nl95ss4.fsf@gnu.org> References: <87txtajclb.fsf@gnu.org> <83d2zx77ub.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1351778331 24224 80.91.229.3 (1 Nov 2012 13:58:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 1 Nov 2012 13:58:51 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 01 14:58:58 2012 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 1TTvIQ-0007fP-7Z for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 14:58:58 +0100 Original-Received: from localhost ([::1]:37557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTvIH-00050I-R0 for ged-emacs-devel@m.gmane.org; Thu, 01 Nov 2012 09:58:49 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:36706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTvIF-0004zx-1C for emacs-devel@gnu.org; Thu, 01 Nov 2012 09:58:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTvIA-0005qK-4k for emacs-devel@gnu.org; Thu, 01 Nov 2012 09:58:46 -0400 Original-Received: from mail-pa0-f41.google.com ([209.85.220.41]:52834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTvI9-0005q6-TM; Thu, 01 Nov 2012 09:58:42 -0400 Original-Received: by mail-pa0-f41.google.com with SMTP id fa10so1876281pad.0 for ; Thu, 01 Nov 2012 06:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=hrw0b+bR9oz5HfSsw8yB2oP+Ia6X0XRWjJqEiXKLxJQ=; b=O7a3Kx+m6NWvqp8sSRpjr4P4K4wgdlYaKDf+KvR3rvhhLdSaHTGDGfwDPCyzeJvwZJ Z8fmBIwOk/njqUiwGX8x/Os7ctxVl1UUkBTCsXyZMHJYI1pLP4mHNVdWwwXXDy1pgJnk 3sQXr9EEpSz7szhE/SpQLGAFp7fggNJQJI3g8RtQVcxsOAJSadY6yexzCogP2JIbw+zU Q/R/mim69vv4jUFgpFzu4jESXliuMGSKv6nnOplrwI+wIU61GWWchW3DG1q8TeVQMqO2 3Skg3ThcCC9dzlGyOhzTj6YeMyAez/oS+NUD22e/+JjXMXQfzOXl2n9L365p6X+unZwI eBVg== Original-Received: by 10.68.237.6 with SMTP id uy6mr20828941pbc.147.1351778320657; Thu, 01 Nov 2012 06:58:40 -0700 (PDT) Original-Received: from ulysses ([155.69.183.42]) by mx.google.com with ESMTPS id sg7sm4071227pbb.50.2012.11.01.06.58.37 (version=SSLv3 cipher=OTHER); Thu, 01 Nov 2012 06:58:39 -0700 (PDT) In-Reply-To: <83d2zx77ub.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 01 Nov 2012 15:47:56 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.220.41 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:154613 Archived-At: Eli Zaretskii writes: >> bzr push bzr+ssh://NAME@bzr.savannah.gnu.org/emacs/emacs-24 >> This pushes the contents of `trunk' into `emacs-24'. > > I don't think you can do that. "push" is only possible from a branch > that didn't diverge from the target. You should "merge" (from trunk > to emacs-24) instead, and then commit. > > However, merging will probably mess up the history in a way that will > make forensics difficult. So I agree with Andreas and Dani who > proposed a separate branch instead. As Stefan pointed out to me in a separate email, pushing will work, one just has to set the bzr configuration variable append_revisions_only to False. The bzr tag doesn't seem to be discarded by the push, either; it is still possible to check it out with -r TAGNAME afterward.