From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: base Date: Tue, 24 Aug 2010 10:29:04 +0200 Message-ID: References: <20100822120642.GA1794@muc.de> <87bp8uzu9d.fsf@mithlond.arda> <871v9o7dmf.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1282638561 29815 80.91.229.12 (24 Aug 2010 08:29:21 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 24 Aug 2010 08:29:21 +0000 (UTC) Cc: emacs-devel@gnu.org To: Leo Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 24 10:29:19 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Onosf-0005eH-CY for ged-emacs-devel@m.gmane.org; Tue, 24 Aug 2010 10:29:18 +0200 Original-Received: from localhost ([127.0.0.1]:41744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Onose-0000Pb-3F for ged-emacs-devel@m.gmane.org; Tue, 24 Aug 2010 04:29:16 -0400 Original-Received: from [140.186.70.92] (port=40358 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnosX-0000PU-4l for emacs-devel@gnu.org; Tue, 24 Aug 2010 04:29:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OnosV-0001Lp-QJ for emacs-devel@gnu.org; Tue, 24 Aug 2010 04:29:09 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:43150) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OnosV-0001LX-KI for emacs-devel@gnu.org; Tue, 24 Aug 2010 04:29:07 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id EA9F01C156A8; Tue, 24 Aug 2010 10:29:04 +0200 (CEST) Original-Received: from hase.home (ppp-88-217-105-125.dynamic.mnet-online.de [88.217.105.125]) by mail.mnet-online.de (Postfix) with ESMTP id A96381C001EE; Tue, 24 Aug 2010 10:29:04 +0200 (CEST) X-Yow: BARRY.. That was the most HEART-WARMING rendition of ``I DID IT MY WAY'' I've ever heard!! In-Reply-To: (Leo's message of "Tue, 24 Aug 2010 08:22:56 +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.6, seldom 2.4 (older, 4) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:129117 Archived-At: Leo writes: > But the minute you publish your screwed-up history to the shared repo, > you can not escape being caught (in git it will happen as soon as > someone does a fetch) and as a result you lose the trust of your peer > developers. The history will then be reset to the correct one (push -f) > and possibly also an apology for the screwup. There are situations where it is agreed upon by the developers that a shared branch is rebased from time to time. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."