From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ken Raeburn Newsgroups: gmane.emacs.devel Subject: emacs bzr and git-bzr Date: Tue, 5 Jan 2010 08:44:28 -0500 Message-ID: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v936) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1262699109 14235 80.91.229.12 (5 Jan 2010 13:45:09 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 5 Jan 2010 13:45:09 +0000 (UTC) To: Emacs development discussions Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 05 14:44:59 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from terminus-est.gnu.org ([66.92.78.210] helo=lists.gnu.org) by lo.gmane.org with esmtp (Exim 4.50) id 1NS9iU-0005MA-2F for ged-emacs-devel@m.gmane.org; Tue, 05 Jan 2010 14:44:58 +0100 Original-Received: from localhost ([127.0.0.1]:46222 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NS9iU-00074q-Iq for ged-emacs-devel@m.gmane.org; Tue, 05 Jan 2010 08:44:58 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NS9iN-00072X-E0 for emacs-devel@gnu.org; Tue, 05 Jan 2010 08:44:51 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NS9iI-0006xn-BC for emacs-devel@gnu.org; Tue, 05 Jan 2010 08:44:51 -0500 Original-Received: from [199.232.76.173] (port=60104 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NS9iI-0006xb-5z for emacs-devel@gnu.org; Tue, 05 Jan 2010 08:44:46 -0500 Original-Received: from splat.raeburn.org ([69.25.196.39]:63882 helo=raeburn.org) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NS9i3-0005dI-EB for emacs-devel@gnu.org; Tue, 05 Jan 2010 08:44:45 -0500 Original-Received: from squish.raeburn.org (squish.raeburn.org [10.0.0.172]) by raeburn.org (8.14.3/8.14.1) with ESMTP id o05DiSl8007187; Tue, 5 Jan 2010 08:44:28 -0500 (EST) X-Mailer: Apple Mail (2.936) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:119430 Archived-At: Is there a way to use one of the "git-bzr" scripts out there that's safe and consistent with the way we want to use bzr for emacs development? > git-bzr: a bidirectional git - bazaar gateway > ============================================= > > This script allows you to add bazaar repositories as git branches in > your > git repository. After that, you can fetch the Bazaar repo, make some > changes, and push it back into Bazaar. The ones I've looked at seem to use "git fast-export | bzr fast- import" when pushing things from git back into bzr. It seems likely that git-bzr could be used to push back into a private bzr development branch, and then "bzr merge" used to pull in changes from there. But then it looks like I've also got to explicitly manage pulling changes down from upstream using both bzr and git commands; and if I try to push something upstream and find upstream has changed, might I have to manage the (possibly non-trivial) re-merging in bzr instead of git where I'd be more comfortable and where I already have a bunch of work in progress? I'd be more interested in a setup where git-bzr can cause things to be pushed back into the FSF bzr repository directly, errorring out when the upstream has changed so that a new merge in needed, or ideally if I attempt a "wrong-way" (left-vs-right-parent) merge, etc. Kind of like how git-svn manages all the subversion access internally, and lets me fix things in git when necessary. Is such a workflow possible with git-bzr? Ken