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: Bzr document unclear. There is no "conflict markers". Date: Sun, 03 Jan 2010 21:25:53 +0200 Message-ID: <831vi7dm7y.fsf@gnu.org> References: <4B40914B.4070203@swipnet.se> <4B40AACE.9020002@swipnet.se> <4B40ED58.7030403@swipnet.se> 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 1262547199 23824 80.91.229.12 (3 Jan 2010 19:33:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 3 Jan 2010 19:33:19 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?UTF-8?B?SmFuIERqw6Rydg==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 03 20:33: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 1NRWCI-0006BS-8W for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 20:33:06 +0100 Original-Received: from localhost ([127.0.0.1]:36373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRWCI-0000lE-K9 for ged-emacs-devel@m.gmane.org; Sun, 03 Jan 2010 14:33:06 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NRWCC-0000ja-B0 for emacs-devel@gnu.org; Sun, 03 Jan 2010 14:33:00 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NRWC7-0000gZ-Sn for emacs-devel@gnu.org; Sun, 03 Jan 2010 14:32:59 -0500 Original-Received: from [199.232.76.173] (port=49922 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NRWC7-0000gT-PK for emacs-devel@gnu.org; Sun, 03 Jan 2010 14:32:55 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:45926) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NRWC7-00078g-IV for emacs-devel@gnu.org; Sun, 03 Jan 2010 14:32:55 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0KVO00000R0K7K00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Sun, 03 Jan 2010 21:27:54 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KVO00KRRREHCCG0@a-mtaout21.012.net.il>; Sun, 03 Jan 2010 21:27:54 +0200 (IST) In-reply-to: <4B40ED58.7030403@swipnet.se> 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:119320 Archived-At: > Date: Sun, 03 Jan 2010 20:17:44 +0100 > From: Jan Dj=C3=A4rv > CC: emacs-devel@gnu.org >=20 > >> I kind of expected merge to merge changes without me having to c= heck in into > >> the quickfix branch first. > > > > Why do you need that? It is so easy to uncommit on a local branc= h > > that committing there shouldn't be a hard decision. It's not lik= e you > > are going to pollute a public repository. >=20 > There is the question of commit logs and Changelogs. There will be= many local=20 > logs, and as I understood it from previous discussion, these will a= ll=20 > propagate to savannah when I push from trunk. But pushing from trunk is another operation. "bzr merge" in the branch merges latest changes from trunk _into_the_branch_, not the other way around. When time comes to merge your branch into mainline= , you should say "bzr merge ../quickfixes" _from_the_trunk_. Only then you need to worry about local logs etc. Or am I missing something?