From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sven Axelsson Newsgroups: gmane.emacs.devel Subject: Re: The Gnus repository is switching to Git as of 2010-04-19 Date: Wed, 21 Apr 2010 13:38:11 +0200 Message-ID: References: <878w8jmjly.fsf@lifelogs.com> <87fx2qgrdw.fsf@lifelogs.com> <878w8hevp6.fsf@lifelogs.com> <87aasxmyo8.fsf@uwakimon.sk.tsukuba.ac.jp> <87zl0xlajm.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 X-Trace: dough.gmane.org 1271850405 1691 80.91.229.12 (21 Apr 2010 11:46:45 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 21 Apr 2010 11:46:45 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 21 13:46:42 2010 connect(): No such file or directory 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 1O4YO6-0007xq-UV for ged-emacs-devel@m.gmane.org; Wed, 21 Apr 2010 13:46:39 +0200 Original-Received: from localhost ([127.0.0.1]:57118 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4YO6-0002x5-By for ged-emacs-devel@m.gmane.org; Wed, 21 Apr 2010 07:46:38 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O4YG1-0002lr-AZ for emacs-devel@gnu.org; Wed, 21 Apr 2010 07:38:17 -0400 Original-Received: from [140.186.70.92] (port=45682 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O4YFz-0002k7-Tb for emacs-devel@gnu.org; Wed, 21 Apr 2010 07:38:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O4YFy-00068B-6x for emacs-devel@gnu.org; Wed, 21 Apr 2010 07:38:15 -0400 Original-Received: from mail-bw0-f225.google.com ([209.85.218.225]:57488) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O4YFx-00067o-Sb for emacs-devel@gnu.org; Wed, 21 Apr 2010 07:38:14 -0400 Original-Received: by bwz25 with SMTP id 25so7070636bwz.8 for ; Wed, 21 Apr 2010 04:38:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:received:message-id:subject:from:to:content-type; bh=9rJsrGZRqmohuJBOTBm0th9hzwW3x1/ucm/u7WicWhY=; b=v/z8WcOjE88MzxLl+6/vjouL+wXOHbEKWxlcID9NpZalRjF6GxtuQHbl2MTirgO7iH 77Niw53kRYDPDCzuZ+VmP+bX7o/m+O8OvJyfV/DRe0Iz/S3elZxEFFXc0wO3kbmfELdh rH8+0oM6o6Ck6kqzVh4Ypj0bxFwIDVeoHm7ds= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; b=xY/4FPAijjttTpbonMbRs/fTUNpIHvgWxL09kAPAW9nhxHm9z2T1pIVhl5oOdKcdVR JQOoTmHqIoxfTIegGkPXAjXMr1HqLNJtHL+8yckeEhH0LO6YE2PAKBYgnyEnHNJsnePX FVfxupuZnvQw/JMIYnRSCreP1ZkRHD2jR2W3I= Original-Received: by 10.239.169.132 with HTTP; Wed, 21 Apr 2010 04:38:11 -0700 (PDT) In-Reply-To: <87zl0xlajm.fsf@uwakimon.sk.tsukuba.ac.jp> Original-Received: by 10.239.193.144 with SMTP id j16mr779749hbi.76.1271849891529; Wed, 21 Apr 2010 04:38:11 -0700 (PDT) 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:123978 Archived-At: On 21 April 2010 06:00, Stephen J. Turnbull wrote: > You've managed what is conceptually a single body of content, using > two separate trees, both actively developed, with persistently > different names for the same file(s), and bidirectional merging? I admit not being completely clear on the implications here, but maybe you want to look into the subtree merge strategy for git. Some information here: http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html. It is intended for this kind uf usage. -- Sven Axelsson ++++++++++[>++++++++++>+++++++++++>++++++++++>++++++ >++++<<<<<-]>++++.+.++++.>+++++.>+.<<-.>>+.>++++.<<. +++.>-.<<++.>>----.<++.>>>++++++.<<<<.>>++++.<----.