I'm not much of a developer, so my "Git-fu" and "SVN-fu" is embarrisingly
low. Can anyone verify my thoughts?
Since I do not push my commits back to the public SVN repo, I only have to
worry about a few commands:
1). Create and checkout my local branch (This will be my "dev-base"?) -
'git checkout -b myDev <opennms-branch>'
--- */ Here, I work on my local files, configs, development, etc */
2). Commit my changes to my git repo - 'git commit'
3). Occasionally, pull in new OpenNMS public updates to the git repo - 'git
svn fetch --fetch-all'
4). Make sure the updates trickle into my branch - 'git svn rebase'
Repeat 2-4 as needed.
Is my understanding correct? I use SVN now, but not much of a master. I'm
just familiar enough with it, to keep me going. Git is entirely new.
Thanks for your advice!
Aaron
On Tue, Jul 29, 2008 at 4:42 PM, Paul Donohue <[EMAIL PROTECTED]> wrote:
> Incase anyone is curious, I think I've figured out all the magic to make
> both pulls and pushes to Subversion work relatively easily.
>
> If you want to try it, install git on your machine (in debian/ubuntu,
> install the 'git-core' package).
> Then download
> http://git.TopQuark.net/OpenNMS.git.tar.gz<http://git.topquark.net/OpenNMS.git.tar.gz>(150MB
> file containing the entire Subversion archive).
> tar -xvzf OpenNMS.git.tar.gz
> cd OpenNMS/
> List branches (both local and remote) - 'git branch -a'
> Create and checkout a local working branch - 'git checkout -b <local
> branch> <remote branch>'
> Pull any new updates from Subversion into git's remote branches - 'git svn
> fetch --fetch-all'
> Pull new updates from git's remote branches into currently checked-out
> branch - 'git svn rebase'
> Edit files as needed
> Commit changes to your local working branch - 'git commit'
> Push git commits up to Subversion - 'git svn rebase ; git svn dcommit'
>
> Hopefully this is enough to get you started...
>
> -Paul
>
> -------------------------------------------------------------------------
> 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
>
--
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
