From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Tue, 02 Nov 2010 16:57:37 +0100 Message-ID: <87d3qnk9am.fsf@telefonica.net> References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> <87hbg0jxyu.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1288713495 22859 80.91.229.12 (2 Nov 2010 15:58:15 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 15:58:15 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 16:58:11 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.69) (envelope-from ) id 1PDJFS-0005fN-S9 for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 16:58:11 +0100 Original-Received: from localhost ([127.0.0.1]:58416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDJFR-0006AM-RR for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 11:58:09 -0400 Original-Received: from [140.186.70.92] (port=36577 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PDJFA-000668-18 for emacs-devel@gnu.org; Tue, 02 Nov 2010 11:57:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PDJF8-0002dv-SA for emacs-devel@gnu.org; Tue, 02 Nov 2010 11:57:51 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:60112) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PDJF8-0002dp-Ju for emacs-devel@gnu.org; Tue, 02 Nov 2010 11:57:50 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1PDJF6-0005R1-4W for emacs-devel@gnu.org; Tue, 02 Nov 2010 16:57:48 +0100 Original-Received: from 83.42.13.98 ([83.42.13.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Nov 2010 16:57:48 +0100 Original-Received: from ofv by 83.42.13.98 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 02 Nov 2010 16:57:48 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 18 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.42.13.98 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:y5aB1BCfMwrSe4Ha1VLgX2zpa64= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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:132275 Archived-At: Stefan Monnier writes: >> In Python, they have a script called svnmerge.py. This script did >> many things, one of them was to keep track of blocked revisions, ie, >> revisions that should not be merged to trunk (or to some given branch, >> IIRC). > > Indeed, the only way I can think of to try and make sure such undesired > merges don't happen is to try and encode this fact into a merge > script. The *only* way? What abut having a branch for that purpose? BTW, do you realize that the script would end cherry-picking commits and that bzr has no support for tracking cherry-picks? This way it is not possible to easily track commits across branches. [snip]