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:57:48 +0200 Message-ID: <83ocl4a60j.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> <873a2gkh0n.fsf@uwakimon.sk.tsukuba.ac.jp> <838wc8bxft.fsf@gnu.org> <874omwd7wx.fsf@telefonica.net> Reply-To: Eli Zaretskii 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 1262970342 21193 80.91.229.12 (8 Jan 2010 17:05:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 17:05:42 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?utf-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 18:05:30 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 1NTIH8-0006V0-JU for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 18:05:27 +0100 Original-Received: from localhost ([127.0.0.1]:43900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTIH9-0001p7-4M for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 12:05:27 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTIAM-0004af-Ro for emacs-devel@gnu.org; Fri, 08 Jan 2010 11:58:26 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTIAI-0004U9-An for emacs-devel@gnu.org; Fri, 08 Jan 2010 11:58:26 -0500 Original-Received: from [199.232.76.173] (port=54942 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTIAH-0004Ts-U9 for emacs-devel@gnu.org; Fri, 08 Jan 2010 11:58:21 -0500 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:48646) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTIAH-0003X0-CJ for emacs-devel@gnu.org; Fri, 08 Jan 2010 11:58:21 -0500 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0KVX00000TR58L00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Fri, 08 Jan 2010 18:57:47 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVX00MYOTS861B0@a-mtaout20.012.net.il>; Fri, 08 Jan 2010 18:57:45 +0200 (IST) In-reply-to: <874omwd7wx.fsf@telefonica.net> 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:119711 Archived-At: > From: =C3=93scar_Fuentes > Date: Fri, 08 Jan 2010 14:48:30 +0100 >=20 > Eli Zaretskii writes: >=20 > >> > --forget-merges=20 > >> > Remove pending merge marker, without changing any files= . > >> >=20 > >> > What is a ``pending merge marker''? > >>=20 > >> A "pending merge" is a merge that you have started with "bzr mer= ge" > >> (or perhaps a "bzr pull" that resulted in a conflict) but not ye= t > >> finished with "bzr commit". > > > > Terrific! So I just did a merge, but it is still considered > > ``pending''? Who could have thought of a more confusing semantic= s?? >=20 > bzr always requires to commit after a merge. Then the docs should have said "pending uncommitted merge results". IOW, the fact that there should be a commit after the merge is not th= e reason to call the just-performed merge "pending". The results of th= e merge are pending commit, but the merge itself is no longer pending, it was already done.