From owner-freebsd-stable@FreeBSD.ORG Tue Jan 1 22:35:45 2013 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1D50B52D for ; Tue, 1 Jan 2013 22:35:45 +0000 (UTC) (envelope-from mdf356@gmail.com) Received: from mail-qc0-f173.google.com (mail-qc0-f173.google.com [209.85.216.173]) by mx1.freebsd.org (Postfix) with ESMTP id BA1E48FC13 for ; Tue, 1 Jan 2013 22:35:44 +0000 (UTC) Received: by mail-qc0-f173.google.com with SMTP id b12so7032744qca.32 for ; Tue, 01 Jan 2013 14:35:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=C4EE5kH2lGwpWev76bkkFcdboC3Q4pzxdXlBowZLDmc=; b=ADQ6PHXZgYbH67kQfhRlcVQXrhajihtiArypMgdmbUDmCdrL/r2YcWfOtMdanIWhNO mmyC+vQxRYshOiy6SSgYIEjMEpPJ8C7mND8Jp7AcSBrQOMjYn08DVzzgzD/A5JCg8k3f ePrhljGu/FSwolEik93htcWC01sViViZr59MNFtG/tpJ33+Y9SGzlwM1f6lt3zynYMGd ibQAhG/oLshR40QH0wuX2LHd4YhD1QpkgQIMWhUcwojqHUZ5uL8axvRR6nfcIHepKVPa ABv7aIbedjF+YL9B4c4UqEULZz/au81aW6kgBg8gdwDC1pnX/+itVg/Htiubo+3LLfvv VWWQ== MIME-Version: 1.0 Received: by 10.224.78.82 with SMTP id j18mr9940345qak.69.1357079743746; Tue, 01 Jan 2013 14:35:43 -0800 (PST) Sender: mdf356@gmail.com Received: by 10.229.61.86 with HTTP; Tue, 1 Jan 2013 14:35:43 -0800 (PST) In-Reply-To: <50E35294.7000501@mu.org> 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: Tue, 1 Jan 2013 14:35:43 -0800 X-Google-Sender-Auth: fNGiqSQMM_XH6rk3P7azQSZo8HE Message-ID: Subject: Re: Does / Is anyone maintaining CVS for FreeBSD? From: mdf@FreeBSD.org To: Alfred Perlstein Content-Type: text/plain; charset=ISO-8859-1 Cc: Derek Kulinski , FreeBSD , Chris H , Chris Rees , Eitan Adler 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: Tue, 01 Jan 2013 22:35:45 -0000 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. Now that was a lot of typing, but heck, it could be scripted too. Cheers, matthew