From owner-freebsd-stable@FreeBSD.ORG Wed Jan 2 18:11:46 2013 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 47AF5FA9; Wed, 2 Jan 2013 18:11:46 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) by mx1.freebsd.org (Postfix) with ESMTP id 07F1A1A81; Wed, 2 Jan 2013 18:11:40 +0000 (UTC) Received: by mail-ob0-f181.google.com with SMTP id oi10so12988235obb.26 for ; Wed, 02 Jan 2013 10:11:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=f3gKffzzJ5Ess9SVmmy+FN7sJ2VJWDCUV2oHZHgQEks=; b=HWSdPY6PqpXqGkVyl4OIWMd2M4kWmshRFVy1v43OJJszZoXCfZgbzWAGk8NKYN9WQm xYu4VmYUy9+GHvWszlQ6pMuEZXIdKTiDRvpqyV72xIhvZ8OV7BhWYyM+gWhadBAbUuwS rXktODLyc58z1nAIeRDwNidBdt0id+r1JP+H0IQtVA3xYfODKbh5Ifh1Kovlgl0QEz9y MMrzFiugZ/XAXcYstHAGjvIqJ+enJv85twrQqQfJGEMPN1XsZ72EhShaQolRl+96cyt8 j3WjB23dvgCATHTEz53GN6Y8aqPdfiMXEgQ0IatHMvhP0ykDhudRz66dc377EQFl5U/Z V0dw== MIME-Version: 1.0 Received: by 10.182.18.133 with SMTP id w5mr38876671obd.64.1357150300391; Wed, 02 Jan 2013 10:11:40 -0800 (PST) Received: by 10.182.89.9 with HTTP; Wed, 2 Jan 2013 10:11:40 -0800 (PST) In-Reply-To: References: <50E1D012.1040004@missouri.edu> <20121231175808.GA1399@glenbarber.us> <6817fb4c15659b194cc658b1dfa58a31.authenticated@ultimatedns.net> <148920333.20121231235441@takeda.tk> <50E3444D.1060307@mu.org> <1444392372.20130101125111@takeda.tk> <50E35294.7000501@mu.org> Date: Wed, 2 Jan 2013 19:11:40 +0100 Message-ID: Subject: Re: Does / Is anyone maintaining CVS for FreeBSD? From: Oliver Pinter To: mdf@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 Cc: FreeBSD , Alfred Perlstein , Eitan Adler , Chris H , Derek Kulinski , Chris Rees X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jan 2013 18:11:46 -0000 On 1/1/13, mdf@freebsd.org wrote: > On Tue, Jan 1, 2013 at 1:18 PM, Alfred Perlstein wrote: >> "git-svn" is somewhat problematic: >> >> http://wiki.freebsd.org/GitWorkflow -> "Using git-svn (FreeBSD committers >> only)" -> >> >>> Things to keep in mind: >>> >>> * >>> >>> Never git merge branches, unless you know what you're doing. >>> >>> * >>> >>> Always git rebase your work on top of master, then git svn dcommit >>> can push the top commits to svn. >>> >>> * >>> >>> Always double-check with git svn dcommit -n to see what would >>> happen. >>> >>> * >>> >>> While you can use git add for new files just fine, you won't be >>> able to push those upstream, you can however use the patch, apply >>> it to some subversion checkout and do the commit there. This is a >>> shortcoming of our very own Subversion hacks, but hey, it's better >>> than nothing! >>> >>> * >>> >>> While git-svn now allows you to set svn:mergeinfo when committing, >>> this is so fragile that the FreeBSD projects discourages its use. >>> Please use svn(1) for merging, sorry. >>> >> >> It's very poor (at least according to the wiki). Seems like you can't do >> much except pull a patch from git, apply to subversion and then commit >> upstream. Eck... > > You can do "normal" code with git-svn just fine. You can't merge svn > branches with git. Due to svn: properties on the files, you can't > create new files with git. Everything else (i.e., in my experience > 90% of the code I do) can be done in git. > > Because git svn dcommit pushes *all* patches, the recommendation is to > look carefully at what will be pushed. But it's a quick git checkout > ; git rebase -i HEAD~N; git svn dcommit; git checkout master; > git svn fetch; git rebase; git delete to push only selected > patches. > In this page you can find some example of aliasing in git: https://git.wiki.kernel.org/index.php/Aliases > Now that was a lot of typing, but heck, it could be scripted too. > > Cheers, > matthew > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" >