Return-Path: Delivered-To: apmail-openjpa-dev-archive@www.apache.org Received: (qmail 92079 invoked from network); 9 Dec 2008 16:14:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Dec 2008 16:14:27 -0000 Received: (qmail 53427 invoked by uid 500); 9 Dec 2008 16:14:39 -0000 Delivered-To: apmail-openjpa-dev-archive@openjpa.apache.org Received: (qmail 53405 invoked by uid 500); 9 Dec 2008 16:14:39 -0000 Mailing-List: contact dev-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list dev@openjpa.apache.org Received: (qmail 53394 invoked by uid 99); 9 Dec 2008 16:14:39 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2008 08:14:39 -0800 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of plinskey@gmail.com designates 209.85.146.182 as permitted sender) Received: from [209.85.146.182] (HELO wa-out-1112.google.com) (209.85.146.182) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2008 16:13:08 +0000 Received: by wa-out-1112.google.com with SMTP id m33so11530wag.9 for ; Tue, 09 Dec 2008 08:13:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:from:to :in-reply-to:content-type:content-transfer-encoding:mime-version :subject:date:references:x-mailer; bh=5fC/8EqFO4VthhU1AcstrNwWf/FWyjv8+xyHoYQb8Ek=; b=mxDYrY4jlbuQdTfJqyuBgLkMdX0UucXUEo70xDylYWzGUM6hSwVPpFSwMK5AUIl5PR B3M3h+jDeCAJDAtk9WoWOO+Az6IjKmNxsM8oShuuyycSJMiub8JU4LxmvrApUqXfzZKy nxMTI+G+pqQDA3JYz9WVx4ExsLLg0sO2C+D7E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:from:to:in-reply-to:content-type :content-transfer-encoding:mime-version:subject:date:references :x-mailer; b=VBSOLehHVWBeyHbJCf/ApIssk1ZqB7FSh3PqDWirYtyDagfnFZ920WU0/eE4xNehfs CY811xK0pOx04mi4rensrGKoZcVbVJdG7WRyUzkG8MYu1jdbS5klHdSMcb12Z8OPj45R b27YBF5er8AcU0hkUbkgAny5ugljyYIduhIsE= Received: by 10.141.197.21 with SMTP id z21mr136244rvp.75.1228839237626; Tue, 09 Dec 2008 08:13:57 -0800 (PST) Received: from ?192.168.1.111? (c-24-5-68-21.hsd1.ca.comcast.net [24.5.68.21]) by mx.google.com with ESMTPS id b8sm325652rvf.3.2008.12.09.08.13.56 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 09 Dec 2008 08:13:57 -0800 (PST) Message-Id: From: Patrick Linskey To: dev@openjpa.apache.org In-Reply-To: <784647.34823.qm@web27808.mail.ukl.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed; delsp=yes Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Apple Message framework v929.2) Subject: Re: AW: [OT] git and Apache's svn? Date: Tue, 9 Dec 2008 08:13:55 -0800 References: <784647.34823.qm@web27808.mail.ukl.yahoo.com> X-Mailer: Apple Mail (2.929.2) X-Virus-Checked: Checked by ClamAV on apache.org > In which way do you like to access the apache svn? To date, I've only used svn to access Apache. > Did you already work with git? Yes. > Do you like to use the git-svn bridge for doing all the local =20 > management with git? I've done this in the past with an svn repo. > Do you only like to manage local branches with git (git on top of a =20= > svn checkout)? That's an interesting technique! Ideally, I'd love it if those of us who choose to use git could use =20 normal git repository collaboration techniques somewhere, and any of =20 us could then push changes into svn somehow. I've run into problems =20 with this in the past because of the 'git-svn' text that gets inserted =20= into the commit messages, which mucks with the SHA-1 identities of =20 commits, and thus with histories. I guess with your git-on-top technique, we could push repos to github =20= that contain just a single branch (or all branches, in exploded =20 format), and we'd be able to collaborate meaningfully, but with svn-=20 style "project branching" instead of git-style. FTR, I tried to 'git svn clone' the Apache repo last night, and got =20 this after about 45 mins: > RA layer request failed: REPORT request failed on '/repos/asf/!svn/=20 > vcc/default': REPORT of '/repos/asf/!svn/vcc/default': 403 Forbidden =20= > (https://svn.apache.org) at /usr/local/git/libexec/git-core/git-svn =20= > line 3957 -Patrick On Dec 9, 2008, at 3:08 AM, Mark Struberg wrote: > Hi Patrick! > > In which way do you like to access the apache svn? > > Did you already work with git? > > Do you only like to manage local branches with git (git on top of a =20= > svn checkout)? > > Do you like to use the git-svn bridge for doing all the local =20 > management with git? > > > The way I use git for Apache projects is the 'git on top' approach =20 > (I'll be more verbose since I do not know what you already know): > > 1.) do a svn co > 2.) create a .gitignore file which contains /target and .svn > 3.) modify my .svnignore to contain .git and .gitignore > 4.) $> git-init > 5.) $> git-add src > 6.) $> git-status to check if the index doesn't contain crap > 7.) $> git-commit -m"initial import from SVN" > > I subsequently do some svn update and commit them to my local git =20 > master branche. > In parallel I do test branches with > $> git-checkout -b mytestbranch > see git-branch for more info > > If the changes work out, you can merge them into master and =20 > afterwards perform a svn commit to the Apache repo. > > > Another way would be to use the git-svn bridge. pro: you'd have the =20= > whole history in git (so you could do a git-blame for example) con: =20= > you cannot use mvn scm (e.g. for releasing), since the maven-scm-=20 > providers-svn relies on having a SVN structure locally and the maven-=20= > scm-providers-git relies on having a remote git repo... > > > LieGr=FC, > strub > > > --- Patrick Linskey schrieb am Di, 9.12.2008: > >> Von: Patrick Linskey >> Betreff: [OT] git and Apache's svn? >> An: dev@openjpa.apache.org >> Datum: Dienstag, 9. Dezember 2008, 8:18 >> Hi, >> >> Has anyone had any experience with using git with >> Apache's svn repository? >> >> Thanks, >> >> -Patrick >> >> --Patrick Linskey >> 202 669 5907 > > > --=20 Patrick Linskey 202 669 5907