Once you have git-svn and the basic workings of git figured out, you may also want to take a look at using stgit with your git repo. It makes it much easier to maintain numerous independent changes on top of the upstream code base within git. I've been using this setup for OpenNMS development for quite some time, and it works well for me.
-Paul On Thu, Aug 21, 2008 at 11:25:59AM -0400, Aaron Paxson wrote: > Alex, > > Yes, you are correct. I don't write back to project svn. I just make > my own changes. > > I'll look into git-svn > > Thanks > > > > > > On 8/20/08, Alex Bennee <[EMAIL PROTECTED]> wrote: > > On Fri, 2008-08-15 at 11:02 +0200, Riccardo Magliocchetti wrote: > >> Aaron Paxson wrote: > >> > I'm sure my case is going to be pretty common amongst the developers, so > >> > > >> > I'm hoping I can get sound opinions and advice. > >> > > >> > I make changes to my ONMS code-base. I want to track and maintain my > >> > code/configuration changes in subversion. Easy enough. > >> > > >> > BUT, I also want to make it easy to track changes between my code, and > >> > the trunk code of ONMS. Upgrading is a PITA when dealing with two > >> > different change sets. > >> > > >> > How does everyone here maintain both repositories, and merging? > > > > Assuming your a satellite developer (i.e. no write access to the project > > SVN) I can say GIT works pretty well. I have to do pretty much the same > > thing. > > > > I use git-svn to keep the master threads upto date and periodically use > > git-rebase to rebase my work on top of the latest code. > > > > -- > > Alex Bennee, Software Engineer > > The only "intuitive" interface is the nipple. After that, it's all > > learned. (Bruce Ediger, [EMAIL PROTECTED], in comp.os.linux.misc, on > > X interfaces.) > > > > > > ------------------------------------------------------------------------- > > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > > Build the coolest Linux based applications with Moblin SDK & win great > > prizes > > Grand prize is a trip for two to an Open Source event anywhere in the world > > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > > _______________________________________________ > > Please read the OpenNMS Mailing List FAQ: > > http://www.opennms.org/index.php/Mailing_List_FAQ > > > > opennms-devel mailing list > > > > To *unsubscribe* or change your subscription options, see the bottom of this > > page: > > https://lists.sourceforge.net/lists/listinfo/opennms-devel > > > > -- > Sent from Gmail for mobile | mobile.google.com > > Aaron J. Paxson > --------- > [EMAIL PROTECTED] > http://aaron.thepaxson5.org > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Please read the OpenNMS Mailing List FAQ: > http://www.opennms.org/index.php/Mailing_List_FAQ > > opennms-devel mailing list > > To *unsubscribe* or change your subscription options, see the bottom of this > page: > https://lists.sourceforge.net/lists/listinfo/opennms-devel > ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Please read the OpenNMS Mailing List FAQ: http://www.opennms.org/index.php/Mailing_List_FAQ opennms-devel mailing list To *unsubscribe* or change your subscription options, see the bottom of this page: https://lists.sourceforge.net/lists/listinfo/opennms-devel
