Date: Wed, 2 Jan 2013 19:11:40 +0100 From: Oliver Pinter <oliver.pntr@gmail.com> To: mdf@freebsd.org Cc: FreeBSD <freebsd-stable@freebsd.org>, Alfred Perlstein <bright@mu.org>, Eitan Adler <lists@eitanadler.com>, Chris H <chris#@1command.com>, Derek Kulinski <takeda@takeda.tk>, Chris Rees <utisoft@gmail.com> Subject: Re: Does / Is anyone maintaining CVS for FreeBSD? Message-ID: <CAPjTQNGkd1YDep%2Bu6Y-a5P7%2B1aZDi2UttYJ4UojM4_4u1eoTJg@mail.gmail.com> In-Reply-To: <CAMBSHm-zo6P_H8Cp-db0y53t-vPTtLSBYnr0w6r8srVWK0Q%2BNA@mail.gmail.com> References: <50E1D012.1040004@missouri.edu> <20121231175808.GA1399@glenbarber.us> <6817fb4c15659b194cc658b1dfa58a31.authenticated@ultimatedns.net> <CADLo83-RtuRE58HORn8ocqRVtcF3ZANJoHh1D8TO=aucwywbQw@mail.gmail.com> <f7a783bba9425aeaf67d94056b49f272.authenticated@ultimatedns.net> <148920333.20121231235441@takeda.tk> <CAF6rxgk62bugOyUz0BFTpk_H6c30ohF0n6p79Q%2B5hZwNB3QcjQ@mail.gmail.com> <50E3444D.1060307@mu.org> <1444392372.20130101125111@takeda.tk> <50E35294.7000501@mu.org> <CAMBSHm-zo6P_H8Cp-db0y53t-vPTtLSBYnr0w6r8srVWK0Q%2BNA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 1/1/13, mdf@freebsd.org <mdf@freebsd.org> wrote: > On Tue, Jan 1, 2013 at 1:18 PM, Alfred Perlstein <bright@mu.org> 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 > <branch>; git rebase -i HEAD~N; git svn dcommit; git checkout master; > git svn fetch; git rebase; git delete <branch> 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" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPjTQNGkd1YDep%2Bu6Y-a5P7%2B1aZDi2UttYJ4UojM4_4u1eoTJg>