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: Re-including rst.el into Emacs repository Date: Tue, 29 May 2012 22:36:49 -0400 Message-ID: References: <30996.1335792548@eskebo.merten-home.homelinux.org> <7259.1336421206@theowa.merten-home.homelinux.org> <6563.1338323400@theowa.merten-home.homelinux.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: dough.gmane.org 1338345544 31882 80.91.229.3 (30 May 2012 02:39:04 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 30 May 2012 02:39:04 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Merten Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 30 04:39:01 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 1SZYoP-0005o3-21 for ged-emacs-devel@m.gmane.org; Wed, 30 May 2012 04:39:01 +0200 Original-Received: from localhost ([::1]:33926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZYmQ-0003Dh-9v for ged-emacs-devel@m.gmane.org; Tue, 29 May 2012 22:36:58 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:54688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZYmM-0003DA-UD for emacs-devel@gnu.org; Tue, 29 May 2012 22:36:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZYmL-0002aT-6r for emacs-devel@gnu.org; Tue, 29 May 2012 22:36:54 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]:54845) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZYmL-0002Z9-2U for emacs-devel@gnu.org; Tue, 29 May 2012 22:36:53 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Av0EAG6Zu09MCpYd/2dsb2JhbABEtBGBCIIVAQEEAVYjBQsLDiYSFBgNJIgcBboJkEQDozOBWIMF X-IronPort-AV: E=Sophos;i="4.75,637,1330923600"; d="scan'208";a="184012999" Original-Received: from 76-10-150-29.dsl.teksavvy.com (HELO pastel.home) ([76.10.150.29]) by ironport2-out.teksavvy.com with ESMTP/TLS/ADH-AES256-SHA; 29 May 2012 22:36:50 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id A691D58F58; Tue, 29 May 2012 22:36:49 -0400 (EDT) In-Reply-To: <6563.1338323400@theowa.merten-home.homelinux.org> (Stefan Merten's message of "Tue, 29 May 2012 22:30:00 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.182 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:150685 Archived-At: >> Thanks, tho you only put the tip of the merge, and forgot its base. > I don't understand. What do you mean by the base of the merge? When you merge, you basically apply the changes from one branch to another. "changes" implies a sort of "diff" and it is not a "diff" between the two branches but a "diff" between the last sync and the tip (i.e. what has changed since the last sync). So the "base" is the revision of the last sync, aka the "ancestor". When working within a modern VCS you nearly never need to worry about it because the VCS figures out what is the ancestor for you, based on the metadata it has. But when working between two separate repositories that do not share metadata, it's useful to preserve this "metadata" explicitly since the VCS won't do it for you. > Done. Please note that I'm German. We *love* the passive form over > here ;-) . I kind of figured. Anyway, thanks for the patch, it looks good. Gr=FCezi, Stefan