From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: patch vs. overwrite in bzr Date: Tue, 03 Apr 2012 12:31:42 -0400 Message-ID: References: <87k42cwys8.fsf@gnu.org> <87limhuldm.fsf@gnu.org> <871uo7g4j6.fsf@gnu.org> <87iphjhbm8.fsf@wanadoo.es> <87398lgrat.fsf_-_@niu.edu> <871uo5c7r0.fsf@wanadoo.es> <87pqbpj5j3.fsf@altern.org> <87aa2szwl9.fsf_-_@engster.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1333471555 26517 80.91.229.3 (3 Apr 2012 16:45:55 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 3 Apr 2012 16:45:55 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Apr 03 18:45:54 2012 Return-path: 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 ) id 1SF6rg-0006mZ-Pc for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 18:45:52 +0200 Original-Received: from localhost ([::1]:48270 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF6f3-0004Wr-TQ for ged-emacs-devel@m.gmane.org; Tue, 03 Apr 2012 12:32:49 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:47928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF6eh-0004OP-Kz for emacs-devel@gnu.org; Tue, 03 Apr 2012 12:32:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SF6eB-0002Wq-B1 for emacs-devel@gnu.org; Tue, 03 Apr 2012 12:32:27 -0400 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:52847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SF6eA-0002SF-H2; Tue, 03 Apr 2012 12:31:55 -0400 Original-Received: from faina.iro.umontreal.ca (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id q33GVg6h014460; Tue, 3 Apr 2012 12:31:43 -0400 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 69A89B448F; Tue, 3 Apr 2012 12:31:42 -0400 (EDT) In-Reply-To: <87aa2szwl9.fsf_-_@engster.org> (David Engster's message of "Tue, 03 Apr 2012 17:03:30 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV4181=0 X-NAI-Spam-Version: 2.2.0.9309 : core <4181> : streams <743539> : uri <1095191> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.22 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:149341 Archived-At: > In a nutshell: It's more or less a GUI to do cherry picking with bzr and > marking commits as 'applied', 'ignored' etc. and saving that state in > the repository between sessions. In the end it will work in both > directions, but currently I'm concentrating on the Emacs -> CEDET, since > this will be the first thing to do next. Also, for the other direction > we will probably use a dedicated branch like 'for-emacs' or something > like that and not directly push into Emacs. The Gnus guys also do two-way syncing and have to solve the same problem. A generic tool would be awesome. I think two-way syncing of branches is a major problem with current VCS technology and I'm eagerly awaiting a good generic solution to it. I'm sure I'm not the only one. Even better if it can be run from a cron job (i.e. fully automatic and deals with conflicts somehow (obviously, it can't resolve them, so it needs to store them somewhere, make sure someone will see them and will be able to resolve them, ...)). Stefan