From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Bzr help
Date: Fri, 20 Dec 2013 22:37:29 +0200
Message-ID: <83wqiz9s3a.fsf@gnu.org>
References: <87wqizbh0j.fsf@thinkpad.tsdh.org> <8338lnbdoe.fsf@gnu.org>
	<87ob4bgy1m.fsf@thinkpad.tsdh.org>
Reply-To: Eli Zaretskii <eliz@gnu.org>
NNTP-Posting-Host: plane.gmane.org
X-Trace: ger.gmane.org 1387571866 32373 80.91.229.3 (20 Dec 2013 20:37:46 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Fri, 20 Dec 2013 20:37:46 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Tassilo Horn <tsdh@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 20 21:37:51 2013
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([208.118.235.17])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Vu6pT-0002UM-Cm
	for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 21:37:51 +0100
Original-Received: from localhost ([::1]:51800 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1Vu6pT-0001gV-0H
	for ged-emacs-devel@m.gmane.org; Fri, 20 Dec 2013 15:37:51 -0500
Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40573)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1Vu6pK-0001gN-Ro
	for emacs-devel@gnu.org; Fri, 20 Dec 2013 15:37:48 -0500
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eliz@gnu.org>) id 1Vu6pF-0000Vs-1V
	for emacs-devel@gnu.org; Fri, 20 Dec 2013 15:37:42 -0500
Original-Received: from mtaout22.012.net.il ([80.179.55.172]:38965)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <eliz@gnu.org>)
	id 1Vu6pE-0000Vg-Pm; Fri, 20 Dec 2013 15:37:36 -0500
Original-Received: from conversion-daemon.a-mtaout22.012.net.il by
	a-mtaout22.012.net.il (HyperSendmail v2007.08) id
	<0MY400H00H2H7700@a-mtaout22.012.net.il>;
	Fri, 20 Dec 2013 22:37:35 +0200 (IST)
Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il
	(HyperSendmail v2007.08) with ESMTPA id
	<0MY400GODHAMSLH0@a-mtaout22.012.net.il>;
	Fri, 20 Dec 2013 22:37:35 +0200 (IST)
In-reply-to: <87ob4bgy1m.fsf@thinkpad.tsdh.org>
X-012-Sender: halo1@inter.net.il
X-detected-operating-system: by eggs.gnu.org: Solaris 10
X-Received-From: 80.179.55.172
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:166676
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/166676>

> From: Tassilo Horn <tsdh@gnu.org>
> Cc: emacs-devel@gnu.org
> Date: Fri, 20 Dec 2013 19:47:01 +0100
> 
> > Having said that, I really don't recommend working from an unbound
> > branch, it will make things harder for you, due to subtle differences
> > in semantics of name-sake commands to which you are used to with git.
> 
> Guessed correctly, though I usually just "git pull --rebase".

With bzr, the equivalent is "bzr merge".

> Thanks for the help, Eli!

You are welcome.