From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: Incorrect merge Date: Tue, 02 Nov 2010 09:29:44 +0800 Message-ID: <4CCF6988.4040804@gnu.org> References: <4CCEC526.3070502@cornell.edu> <87aaltc9rc.fsf@stupidchicken.com> <83pqup53qb.fsf@gnu.org> <83fwvk6arf.fsf@gnu.org> <87pquok5pi.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit X-Trace: dough.gmane.org 1288661427 19058 80.91.229.12 (2 Nov 2010 01:30:27 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 2 Nov 2010 01:30:27 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 02 02:30:23 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 1PD5hd-0008MV-Ts for ged-emacs-devel@m.gmane.org; Tue, 02 Nov 2010 02:30:22 +0100 Original-Received: from localhost ([127.0.0.1]:49723 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD5hc-00006R-Tn for ged-emacs-devel@m.gmane.org; Mon, 01 Nov 2010 21:30:21 -0400 Original-Received: from [140.186.70.92] (port=46643 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PD5hR-00006M-Md for emacs-devel@gnu.org; Mon, 01 Nov 2010 21:30:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PD5hQ-0005I0-JK for emacs-devel@gnu.org; Mon, 01 Nov 2010 21:30:09 -0400 Original-Received: from mail-pv0-f169.google.com ([74.125.83.169]:63906) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PD5hQ-0005Ht-9g for emacs-devel@gnu.org; Mon, 01 Nov 2010 21:30:08 -0400 Original-Received: by pvc21 with SMTP id 21so1047983pvc.0 for ; Mon, 01 Nov 2010 18:30:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=gJyJ6Db0yp5lj66ESYymlcOx1uhWv1OcZuvSyskTGUs=; b=QApGs9azI439b8yWDSm7OlGx1JOeIXRW3OjWKap9oJuMELyQ0mI/z+RDYc2/557hrD zMPAi8+f3W4AJccsbi4hn/a/ZAdyFxxN2TlCGZgGEh2W15ct5KUZihfM0hs1t96FmysV y+6zaOmmxdz52M/TnoM/h+tpQVAfGE7jYAXps= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding; b=Sqj68FxavpoQnRkO4JeZ/2No01D7YGB8DKQ9pAbd1D7qTm5rXdO7JHUJBGqzWceH1a 8qThoImX4v9r1QSawDMS6uzAUGozV5iGQqnJZA7t1dZv02AwvhGy+Yn2dbm9TRb+SeG0 9UZk6xUSczNNnaDlQtnoXUEc74A5RxmlVO7Oo= Original-Received: by 10.142.192.14 with SMTP id p14mr4707669wff.303.1288661407335; Mon, 01 Nov 2010 18:30:07 -0700 (PDT) Original-Received: from [10.1.1.54] ([61.4.103.130]) by mx.google.com with ESMTPS id x35sm9867584wfd.13.2010.11.01.18.30.05 (version=SSLv3 cipher=RC4-MD5); Mon, 01 Nov 2010 18:30:06 -0700 (PDT) User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.1.7) Gecko/20100111 Thunderbird/3.0.1 In-Reply-To: <87pquok5pi.fsf@telefonica.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) 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:132263 Archived-At: On 02/11/2010 07:02, Óscar Fuentes wrote: > The problem is that not everything that is committed on emacs-23 branch > is intended to be merged into trunk. The solution is obvious: don't > merge stuff from emacs-23 into trunk. Just use another branch (let's > call it `common-fixes') where patches intended for trunk and emacs-23 > are applied. Then you merge `common-fixes' into trunk and emacs-23. > How does the developer verify that their change is correct? The common-fixes branch cannot be expected to build after some time has passed, as the changes commited to it might depend on other changes that differ between the trunk and emacs-23 branch, but are nonetheless required.