Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Wed, 20 Feb 2002 15:17:51 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Wed, 20 Feb 2002 15:17:36 -0500 Received: from tomts15-srv.bellnexxia.net ([209.226.175.3]:47773 "EHLO tomts15-srv.bellnexxia.net") by vger.kernel.org with ESMTP id ; Wed, 20 Feb 2002 15:17:18 -0500 Content-Type: text/plain; charset="iso-8859-1" From: Ed Tomlinson Organization: me To: Larry McVoy , Rik van Riel Subject: Re: [PATCH] struct page, new bk tree Date: Wed, 20 Feb 2002 15:17:12 -0500 X-Mailer: KMail [version 1.3.2] Cc: Linus Torvalds , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Larry McVoy In-Reply-To: <20020219155706.H26350@work.bitmover.com> In-Reply-To: <20020219155706.H26350@work.bitmover.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-Id: <20020220201716.45A574E2E@oscar.casa.dyndns.org> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org In my opinion the idea of cset -x (while usefull) is fundamentally broken. The result of this is that ideas like blacklist need to be considered. I would propose instead an undo -x, that would generate a cset to reverse the one following the -x. This might lead to conflicts - these would be resolved the normal bk fashion. If bk handled ?bad? csets in this manner there would be no need for blacklists - it is more robust in that you can always used undo -x. Comments? Ed Tomlinson On February 19, 2002 06:57 pm, Larry McVoy wrote: > On Tue, Feb 19, 2002 at 08:47:17PM -0300, Rik van Riel wrote: > > I've removed the old (broken) bitkeeper tree with the > > struct page changes and have put a new one in the same > > place ... with the struct page changes in one changeset > > with ready checkin comment. > > > > You can resync from bk://linuxvm.bkbits.net/linux-2.5-struct_page > > and you'll see that the stupid etc/config change is no longer there. > > Since you two are doing the BK dance, here's a question for you: > I can imagine that this sort of back and forth will happen quite a bit, > someone makes a change, then Linus (or whoever) says "no way", and the > developer goes back, cleans up the change, and repeats. That's fine for > Linus & Rik because Linus tosses the changeset and Rik tosses it, but > what about the other people who have pulled? Those changesets are now > wandering around in the network, just waiting to pop back into a tree. > > This is at the core of my objections to the "reorder the events" theme > which we had a while back. You can reorder all you want, but if there > are other copies of the events floating around out there, they may come > back. > > A long time ago, there was some discussion of a changeset blacklist. > The idea being that if you want to reorder/rewrite/whatever, and your > changes have been pulled/pushed/whatever, then it would be good to be > able to state that in the form of some list which may be used to see > if you have garbage changesets. > > We could have a --blacklist option to undo which says "undo these > changes but remember their "names" in the BitKeeper/etc/blacklist file. > The next changeset you make will check in that file. Note that each > changeset has a unique name which is used internally, somewhat like a > file has an inode number. So we can save those names. Then if you do > a pull or someone does a push, the incoming csets can be compared with > the blacklist and rejected if found. > > Do you think this would be useful? Would you use it if we made it? - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/