From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Daniel Clemente Newsgroups: gmane.emacs.devel Subject: Re: log format for vc-bzr Date: Fri, 08 Jan 2010 12:54:03 +0100 Message-ID: <87ocl4ak2s.fsf@yahoo.com> 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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1262951679 18718 80.91.229.12 (8 Jan 2010 11:54:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 11:54:39 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 12:54:32 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 1NTDQG-0002ah-16 for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 12:54:32 +0100 Original-Received: from localhost ([127.0.0.1]:49325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTDQG-0003nV-Kj for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 06:54:32 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTDQ9-0003ll-KB for emacs-devel@gnu.org; Fri, 08 Jan 2010 06:54:25 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTDQ4-0003hM-Gf for emacs-devel@gnu.org; Fri, 08 Jan 2010 06:54:24 -0500 Original-Received: from [199.232.76.173] (port=47653 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTDQ3-0003gt-Pq for emacs-devel@gnu.org; Fri, 08 Jan 2010 06:54:19 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:35426) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NTDQ3-0007Jm-4c for emacs-devel@gnu.org; Fri, 08 Jan 2010 06:54:19 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NTDPx-0002VB-QC for emacs-devel@gnu.org; Fri, 08 Jan 2010 12:54:13 +0100 Original-Received: from 89.6.42.98 ([89.6.42.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 08 Jan 2010 12:54:13 +0100 Original-Received: from dcl441-bugs by 89.6.42.98 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 08 Jan 2010 12:54:13 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 27 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 89.6.42.98 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:DMhYBNJeEYSp8IBvqWGS3RYWz8Q= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) 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:119671 Archived-At: 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: ,---- | The working tree contains a list of pending merged revisions, which will | be included as parents in the next commit. Normally, revert clears that | list as well as reverting the files. If any files are specified, revert | leaves the pending merge list alone and reverts only the files. Use "bzr | revert ." in the tree root to revert all files but keep the merge record, | and "bzr revert --forget-merges" to clear the pending merge list without | reverting any files. | | 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. `----