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: log format for vc-bzr Date: Fri, 8 Jan 2010 11:28:08 +0100 Message-ID: References: <200912081747.nB8HlwPR021836@godzilla.ics.uci.edu> <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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1262946688 3727 80.91.229.12 (8 Jan 2010 10:31:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 8 Jan 2010 10:31:28 +0000 (UTC) Cc: =?UTF-8?Q?=C3=93scar_Fuentes?= , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 08 11:31:21 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 1NTC7j-0003YW-Kw for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 11:31:19 +0100 Original-Received: from localhost ([127.0.0.1]:46632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTC7k-0001rr-32 for ged-emacs-devel@m.gmane.org; Fri, 08 Jan 2010 05:31:20 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NTC59-00015Z-G0 for emacs-devel@gnu.org; Fri, 08 Jan 2010 05:28:39 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NTC53-00011m-GQ for emacs-devel@gnu.org; Fri, 08 Jan 2010 05:28:37 -0500 Original-Received: from [199.232.76.173] (port=42127 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NTC53-00011R-4x for emacs-devel@gnu.org; Fri, 08 Jan 2010 05:28:33 -0500 Original-Received: from mail-bw0-f215.google.com ([209.85.218.215]:48097) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NTC50-000301-G6; Fri, 08 Jan 2010 05:28:30 -0500 Original-Received: by bwz7 with SMTP id 7so13237572bwz.26 for ; Fri, 08 Jan 2010 02:28:29 -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=sJ8KRIBZFk9AJzKgCycrfOlx4h/KEicRLA8oZiD046c=; b=JneSylvGtfSxXElevunB5Yf9o/q8to341fSuC65qmlFbydszwDTqVVelQp5YA0uo9u ob+XvoNGMhilz5Lz63TDPmbw8mkX+ir2AZ79spor9Wrzq4NaISiIh8oMbLjxnJ2QipN3 3S66asggA/XZnmFSKEGzoVpboa6mqtpodJgws= 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=CS+Bogvo709+KotKNzUhf/o3DLRKpMtYBS+dIFSFR67oquE4zwIe52FHAmQkrlKPRd MriwEPTovjmtlJ0chG1cmLlFFTB+kUYeIzik2RT+/xvYLAm4a+YtQWmC7P7QjbJNH5UF qwcLGU5NaUzW/NlhQGLXNSffySPipmOOHBgQI= Original-Received: by 10.204.11.15 with SMTP id r15mr1046342bkr.40.1262946509094; Fri, 08 Jan 2010 02:28:29 -0800 (PST) In-Reply-To: <83ljg9as4g.fsf@gnu.org> 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:119664 Archived-At: On Fri, Jan 8, 2010 at 10:00, Eli Zaretskii wrote: > As usual, the Bazaar documentation doesn't say anything about this > option that can be grokked by Bazaar non-experts. > > =C2=A0 =C2=A0--forget-merges > =C2=A0 =C2=A0 =C2=A0Remove pending merge marker, without changing any fil= es. > > What is a ``pending merge marker''? After doing a merge to a branch, bzr status shows the pending merges: C:\emacs\trunk> bzr status modified: myfile.el pending merge tips: (use -v to see all merge revisions) Juanma Barranquero 2010-01-02 myfile.el: New file. That means that the next commit will store the changes as a merge: "[merge]" will appear in the commit description, and you will be able to use log -n0 to see the history of the merge. > And how removing it resolves the > problem at hand? "bzr revert --pending-merges" removes the info about the local changes being a merge. The working copy remains as it is (i.e, it includes all the changes from the merge), but Bazaar "forgets" that they came from a merge operation. The next commit will be a normal, non-merge commit. > And if this is the magic wand to leave personal > commit comments out of the public repository, then shouldn't we add > this to the recommended workflow on the wiki? IIUC what =C3=93scar was saying, he meant that --pending-merges can be used to sanitize a branch, by selectively copying and squashing commits from one branch into another before merging the changes back into the trunk. That's not necessarily an easily automated process. At some point, people has to try and learn, we cannot give everything as recipes, because there's no one single good way to do it all. With --pending-merges you can leave personal commit comments out, or depending of the developer's habits, *all* the branch development comments out. Imagine that the unicode-2 branch were merged with bzr merge ../unicode-2 bzr revert --pending-merges bzr commit -m "Merge unicode-2 branch." That's much less useful that the normal merge / commit, where the history of the branch is accessible. So encouraging people to use --pending-merges as a recipe is much worse than encouraging them to just read the docs, try things and ask when they do not understand something. All this in my VHO, of course. Juanma