From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: log format for vc-bzr Date: Fri, 08 Jan 2010 18:45:17 +0200 Message-ID: <83skaga6le.fsf@gnu.org> References: <200912081747.nB8HlwPR021836@godzilla.ics.uci.edu> <874oo1w9y1.fsf@telefonica.net> <87tyw1uss6.fsf@telefonica.net> <200912082203.nB8M3FLP023771@godzilla.ics.uci.edu> <87hbs1at4u.fsf@notengoamigos.org> <871vj3sxgy.fsf@telefonica.net> <87ws0vrd46.fsf@telefonica.net> <87hbqxa9ti.fsf@ambire.localdomain> <87k4vtd1uy.fsf@telefonica.net> <83ljg9as4g.fsf@gnu.org> <87ocl4ak2s.fsf@yahoo.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1262969611 18509 80.91.229.12 (8 Jan 2010 16:53:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 16:53:31 +0000 (UTC) Cc: emacs-devel@gnu.org To: Daniel Clemente Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 17:53:24 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 1NTI5R-00012l-Vq for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 17:53:22 +0100 Original-Received: from localhost ([127.0.0.1]:51590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTI5S-00078l-IR for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 11:53:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTHxk-0002oM-Dg for emacs-devel@gnu.org; Fri, 08 Jan 2010 11:45:24 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTHxf-0002mW-Iv for emacs-devel@gnu.org; Fri, 08 Jan 2010 11:45:24 -0500 Original-Received: from [199.232.76.173] (port=34630 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTHxf-0002mQ-8q for emacs-devel@gnu.org; Fri, 08 Jan 2010 11:45:19 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:46791) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTHxe-0004AT-3y for emacs-devel@gnu.org; Fri, 08 Jan 2010 11:45:18 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KVX00M00T0XWS00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 08 Jan 2010 18:45:16 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVX00L62T7EL4C0@a-mtaout20.012.net.il>; Fri, 08 Jan 2010 18:45:15 +0200 (IST) In-reply-to: <87ocl4ak2s.fsf@yahoo.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:119707 Archived-At: > From: Daniel Clemente > Date: Fri, 08 Jan 2010 12:54:03 +0100 > > > El vie, ene 08 2010 a les 10:00, Eli Zaretskii va escriure: > > As usual, the Bazaar documentation doesn't say anything about this > > option that can be grokked by Bazaar non-experts. > > > It does. See the 2 last paragraphs of bzr help revert: Please give me some minimal benefit of a doubt. I already read all the docs on my machine that I found relevant, including "bzr help revert". First, what it says on my system does not include this part: > | Using "bzr revert --forget-merges", it is possible to apply the changes > | from an arbitrary merge as a single revision. To do this, perform the > | merge as desired. Then doing revert with the "--forget-merges" option will > | keep the content of the tree as it was, but it will clear the list of > | pending merges. The next commit will then contain all of the changes that > | would have been in the merge, but without any mention of the other parent > | revisions. Because this technique forgets where these changes originated, > | it may cause additional conflicts on later merges involving the source and > | target branches. I use the latest stable release, 2.0.3. More importantly, this addition, while it does help somewhat, still falls short of making the effect clear. What is a ``list of pending merges''? (This was already explained in this thread, but the docs don't explain that.) What are ``other parent revisions''? Without knowing that, it is impossible to understand the net effect this command will produce.