From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Joshua Judson Rosen Newsgroups: gmane.emacs.devel Subject: "No safeguard against rewriting upstream bzr history" (was: bzr is dying; Emacs needs to move) Date: Sun, 05 Jan 2014 11:13:48 -0500 Message-ID: <87k3eecsoz.fsf_-_@slice.rozzin.com> References: <20140102095347.6834E381D0C@snark.thyrsus.com> <87k3eisirv.fsf@zigzag.favinet> <87a9faq4wv.fsf@zigzag.favinet> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1388938458 17651 80.91.229.3 (5 Jan 2014 16:14:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Jan 2014 16:14:18 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 05 17:14:26 2014 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 1VzqLH-0007aD-0W for ged-emacs-devel@m.gmane.org; Sun, 05 Jan 2014 17:14:23 +0100 Original-Received: from localhost ([::1]:58418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzqLG-0005qQ-HW for ged-emacs-devel@m.gmane.org; Sun, 05 Jan 2014 11:14:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzqL9-0005h0-GW for emacs-devel@gnu.org; Sun, 05 Jan 2014 11:14:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VzqL4-0000st-Oa for emacs-devel@gnu.org; Sun, 05 Jan 2014 11:14:15 -0500 Original-Received: from 209-20-69-211.slicehost.net ([209.20.69.211]:38302 helo=slice.rozzin.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzqL4-0000rF-KK for emacs-devel@gnu.org; Sun, 05 Jan 2014 11:14:10 -0500 Original-Received: by slice.rozzin.com (Postfix, from userid 1000) id CC197C8207; Sun, 5 Jan 2014 11:13:48 -0500 (EST) In-Reply-To: <87a9faq4wv.fsf@zigzag.favinet> (Thien-Thi Nguyen's message of "Sun, 05 Jan 2014 08:11:28 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 209.20.69.211 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:167371 Archived-At: Thien-Thi Nguyen writes: > > - Investigate "no safeguard against rewriting upstream bzr repo history": > . > > I'd like to determine if the "doesn't work" part lies in bzrlib or > in git-remote-bzr. I suspect the latter, since there is no call > to =E2=80=98die=E2=80=99 in that code. Hmmm, time to snapshot the (rel= atively) > svelte repo and see what damage a tweaked git-remote-bzr can do, > i suppose... If it's true, one could also say that the upstream branches are misconfigured: if you set "append_revisions_only =3D True" in the branch's .bzr/branch/branch.conf, then the bzr server will enforce that revisions are only ever added to the left hand side (mainline edge) of the DAG and never removed (either by uncommitting or by re-orienting the DAG). In the case where "append_revisions_only =3D False", then "bzr push" is allowed to reorient the DAG so that a different edge becomes the left hand side (which happens if someone merges trunk down _into their branch_ and then pushes their branch up), "bzr uncommit" is allowed to remove revisions, and "bzr push --overwrite" is allowed to stomp all over things. When creating new branches, there's an argument to "bzr init" that sets this option; if you have write access to the upstream emacs branches through SFTP, you should probably be able to set options like append_revisions_only on the existing branch by SFTP'ing up a new branch.conf file. --=20 "'tis an ill wind that blows no minds."