From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juanma Barranquero Newsgroups: gmane.emacs.devel Subject: Re: reversion revulsion Date: Fri, 8 Jan 2010 15:32:58 +0100 Message-ID: References: <200912081747.nB8HlwPR021836@godzilla.ics.uci.edu> <871vj3sxgy.fsf@telefonica.net> <87ws0vrd46.fsf@telefonica.net> <87hbqxa9ti.fsf@ambire.localdomain> <87k4vtd1uy.fsf@telefonica.net> <83ljg9as4g.fsf@gnu.org> <87wrzszz4y.fsf_-_@ambire.localdomain> <87k4vsu31c.fsf@ambire.localdomain> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1262961793 20998 80.91.229.12 (8 Jan 2010 14:43:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 14:43:13 +0000 (UTC) Cc: emacs-devel@gnu.org To: Thien-Thi Nguyen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 15:43:06 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.50) id 1NTG3O-0003XZ-08 for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 15:43:06 +0100 Original-Received: from localhost ([127.0.0.1]:36979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTG3O-0005Hj-LL for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 09:43:06 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTFvf-0008JB-Fk for emacs-devel@gnu.org; Fri, 08 Jan 2010 09:35:07 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTFva-0008Gk-Vp for emacs-devel@gnu.org; Fri, 08 Jan 2010 09:35:07 -0500 Original-Received: from [199.232.76.173] (port=50965 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTFvZ-0008GU-H1 for emacs-devel@gnu.org; Fri, 08 Jan 2010 09:35:01 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:61351) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTFvY-0000Sx-Ee for emacs-devel@gnu.org; Fri, 08 Jan 2010 09:35:01 -0500 Original-Received: by bwz7 with SMTP id 7so13359918bwz.26 for ; Fri, 08 Jan 2010 06:34:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=bGYV2uHhhI/HyFYSqsmbdKQWQHny/TlXtimHeEFsDXw=; b=qUkWBLJQzOW6jTQC+FVdtZNDvHcTXb4xpt+1o8JI1OXE57AT9JU1My5xW7wn81NJ1h GEAxMywX/UwqVo+DNwbaBxZI+yjeQVtMe41x5QkzEI0p/JrLlfofzPU//c1+96gyZjJY xSMwSP4VbDgrvm6q043wU7PE0Jx4V2bPM+XOE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=oQyindIa2MlR6LHXG/aBEXkIUj6A0zVx6d0Z30jR5tc/+udVBw9VDHqaFJRPlxIzyi oX4Qx243UBzq+XFAWYZfQ9kLF50bqt1gF6iEnEfi87EjPhIsvG0ya1ay5DHcb8fwsYkT S9eXeAdvipamAYUHneHp+5MKCxmMIeMZr4XUM= Original-Received: by 10.204.2.196 with SMTP id 4mr4926bkk.7.1262961297358; Fri, 08 Jan 2010 06:34:57 -0800 (PST) In-Reply-To: <87k4vsu31c.fsf@ambire.localdomain> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:119697 Archived-At: On Fri, Jan 8, 2010 at 14:41, Thien-Thi Nguyen wrote: > bzr-merge-squash () { bzr merge ; > =C2=A0bzr log | grep INTERESTING-LOG-ENTRIES > LOG-ENTRY-INIT ; > =C2=A0bzr revert --forget-merges ; } > > is more suited (followed by "bzr commit -f LOG-ENTRY-INIT"), > and everyone defines INTERESTING-LOG-ENTRIES as they see fit. > Am i back on the right page now? bzr log won't show anything different before and after the merge, because a merge does not commit. Juanma