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: a review of the merge (Re: Emacs.app merged) Date: Wed, 16 Jul 2008 12:15:12 -0400 Message-ID: References: <1C66F1FC-BF82-4365-944D-ADCC4D1F435C@gmail.com> <200807160925.m6G9PuVj012462@sallyv1.ics.uci.edu> <487DC6A7.7020001@gnu.org> <475E9EF7-3FCC-4DB5-B1DB-983EB4D0E88F@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1216224995 20476 80.91.229.12 (16 Jul 2008 16:16:35 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 16 Jul 2008 16:16:35 +0000 (UTC) Cc: Dan Nicolaescu , emacs- devel , Jason Rumney To: Adrian Robert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 16 18:17:23 2008 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.50) id 1KJ9gr-0006Fv-Q7 for ged-emacs-devel@m.gmane.org; Wed, 16 Jul 2008 18:17:18 +0200 Original-Received: from localhost ([127.0.0.1]:38862 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJ9fz-0006rJ-7p for ged-emacs-devel@m.gmane.org; Wed, 16 Jul 2008 12:16:23 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KJ9fv-0006ph-RH for emacs-devel@gnu.org; Wed, 16 Jul 2008 12:16:19 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KJ9fv-0006nn-4A for emacs-devel@gnu.org; Wed, 16 Jul 2008 12:16:19 -0400 Original-Received: from [199.232.76.173] (port=52169 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KJ9fu-0006na-VE for emacs-devel@gnu.org; Wed, 16 Jul 2008 12:16:18 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:48992) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KJ9fp-0002Eh-RR; Wed, 16 Jul 2008 12:16:13 -0400 Original-Received: from ceviche.home (vpn-132-204-232-63.acd.umontreal.ca [132.204.232.63]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id m6GGGCOC008116; Wed, 16 Jul 2008 12:16:12 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 12B64B4097; Wed, 16 Jul 2008 12:15:12 -0400 (EDT) In-Reply-To: <475E9EF7-3FCC-4DB5-B1DB-983EB4D0E88F@gmail.com> (Adrian Robert's message of "Wed, 16 Jul 2008 08:17:49 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 3 Rules triggered HAS_X_HELO=0, RV3061=0, XH_GE5=0 X-detected-kernel: by monty-python.gnu.org: 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:100816 Archived-At: > Sorry about this. The way I did the merge was: > 1) Merge from trunk in bzr on 7/14 > 2) Do a CVS checkout around the same time > 3) Copy needed files from bzr tree to CVS tree on 7/15 *Never* copy files like this. Instead, extract a patch from one tree and apply it to the other. Otherwise you risk losing changes. This is true of any work with branches and things like that: nothing specific to Emacs at all. Stefan