From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4781 invoked by alias); 3 Dec 2012 12:31:05 -0000 Received: (qmail 4753 invoked by uid 22791); 3 Dec 2012 12:31:02 -0000 X-SWARE-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED X-Spam-Check-By: sourceware.org Received: from wildebeest.demon.nl (HELO gnu.wildebeest.org) (212.238.236.112) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 03 Dec 2012 12:30:54 +0000 Received: from wildebeest.demon.nl ([212.238.236.112] helo=[172.31.17.37]) by gnu.wildebeest.org with esmtp (Exim 4.63) (envelope-from ) id 1TfVAW-0005YW-Gq; Mon, 03 Dec 2012 13:30:45 +0100 Subject: Re: [cp-patches] tagging classpath for GCC import From: Mark Wielaard To: Pekka Enberg Cc: Andrew Haley , Matthias Klose , classpath-patches@gnu.org, GCC Java , Dr Andrew John Hughes In-Reply-To: References: <50BA49AE.3070403@ubuntu.com> <20121202212044.GA22310@toonder.wildebeest.org> <50BBFD36.50906@ubuntu.com> <1354525513.3581.13.camel@bordewijk.wildebeest.org> <50BC70F7.5050606@redhat.com> <1354529065.3581.73.camel@bordewijk.wildebeest.org> Content-Type: text/plain; charset="UTF-8" Date: Mon, 03 Dec 2012 12:31:00 -0000 Message-ID: <1354537841.3581.89.camel@bordewijk.wildebeest.org> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Spam-Score: -1.9 (-) X-IsSubscribed: yes Mailing-List: contact java-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-owner@gcc.gnu.org X-SW-Source: 2012-12/txt/msg00008.txt.bz2 On Mon, 2012-12-03 at 12:43 +0200, Pekka Enberg wrote: > On Mon, Dec 3, 2012 at 12:04 PM, Mark Wielaard wrote: > > There is the classpath git tree at > > http://icedtea.classpath.org/mirror/git/classpath/classpath/ > > which does have all that. But it only has the CVS part of the history. > > The trick now is to figure out how to merge that git tree with the > > official GNU Classpath git tree on savannah. Sadly my git foo isn't > > strong enough to figure that out :{ > > So any hints or tips from some more experienced git users appreciated. > > The mirror git tree is where we branched off our current development > tree. You should be able to just push the tags to the tree on > Savannah. Andi? aha, they are indeed mostly the same, though there is one commit that doesn't match (the top one in the mirror, is also present on savannah but under another commit id) which makes things slightly confusing. So in principle git push --tags should do it, but how about the branches? Thanks, Mark