From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/69536 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.gnus.general Subject: Re: Gnus Git repository info and comitters: need updated password Date: Wed, 14 Apr 2010 08:10:57 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <8739yy89i6.fsf@lifelogs.com> References: <87sk71o198.fsf@lifelogs.com> <87bpdpnkbd.fsf@randomsample.de> <87vdbweexj.fsf@lifelogs.com> <87sk6yl3oa.fsf@lifelogs.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" X-Trace: dough.gmane.org 1271250734 20227 80.91.229.12 (14 Apr 2010 13:12:14 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 14 Apr 2010 13:12:14 +0000 (UTC) To: Ding Mailing List Original-X-From: ding-owner+M17931@lists.math.uh.edu Wed Apr 14 15:12:12 2010 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1O22O0-0003Fq-NT for ding-account@gmane.org; Wed, 14 Apr 2010 15:12:09 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1O22NS-0001li-Ut; Wed, 14 Apr 2010 08:11:35 -0500 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1O22NR-0001lV-Ml for ding@lists.math.uh.edu; Wed, 14 Apr 2010 08:11:33 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtp (Exim 4.69) (envelope-from ) id 1O22NQ-0007G6-BA for ding@lists.math.uh.edu; Wed, 14 Apr 2010 08:11:33 -0500 Original-Received: from chirelay1o.jumptrading.com ([38.98.147.153] helo=chirelay1.jumptrading.com) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1O22NO-0000nY-00 for ; Wed, 14 Apr 2010 15:11:30 +0200 Original-Received: from chirelay1.jumptrading.com (unknown [127.0.0.1]) by chirelay1.jumptrading.com (Symantec Mail Security) with ESMTP id A2CA1320011 for ; Wed, 14 Apr 2010 08:10:59 -0500 (CDT) X-AuditID: 26629395-a760fbb000004e01-cc-4bc5bee345bc Original-Received: from chiexchange02.w2k.jumptrading.com (unknown [38.98.147.140]) by chirelay1.jumptrading.com (Symantec Mail Security) with ESMTP id 60B4D2DC005 for ; Wed, 14 Apr 2010 08:10:59 -0500 (CDT) Original-Received: from internalsmtp.w2k.jumptrading.com (10.2.4.29) by chiexchange02.w2k.jumptrading.com (10.2.4.71) with Microsoft SMTP Server id 8.1.291.1; Wed, 14 Apr 2010 08:10:59 -0500 Original-Received: from tzlatanov-ubuntu-desktop.jumptrading.com ([10.2.13.58]) by internalsmtp.w2k.jumptrading.com with Microsoft SMTPSVC(6.0.3790.1830); Wed, 14 Apr 2010 08:10:58 -0500 X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6;d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" In-Reply-To: (Andreas Schwab's message of "Wed, 14 Apr 2010 13:24:15 +0200") User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/24.0.50 (gnu/linux) X-OriginalArrivalTime: 14 Apr 2010 13:10:58.0771 (UTC) FILETIME=[EC9C0230:01CADBD3] X-Brightmail-Tracker: AAAAAA== X-Spam-Score: -2.3 (--) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:69536 Archived-At: On Wed, 14 Apr 2010 13:24:15 +0200 Andreas Schwab wrote: AS> Ted Zlatanov writes: >> I followed this procedure to import (plus an initial test commit) for >> both yours and David Engster's repositories: >> >> git remote add -f gnus-cvs-mirror git://repo.or.cz/gnus.git >> git merge -s ours --no-commit gnus-cvs-mirror/master >> git read-tree --prefix=/ -u gnus-cvs-mirror/master >> git commit -m 'merge the Gnus CVS mirror from git://repo.or.cz/gnus.git' AS> What's wrong with git clone? Why do you need to merge anything? I thought this was the proper procedure for merging two repositories, and that `git clone' preserved the upstream master (repo.or.cz) which I didn't want. Could you provide instructions that would end up with a "gnus.git" directory populated properly, to save us all time? Thanks for your patience. On Wed, 14 Apr 2010 13:34:39 +0200 Romain Francoise wrote: RF> Ted Zlatanov writes: >> I still consider this experimental so don't rely on it. We'll >> probably go live this week. RF> The repository appears to have a single branch (master) and no tags, RF> is that considered normal? It may be an artifact of the way I merged. If so, sorry for the inconvenience. Ted