(to kde-scm-interest: this relates to amarok) I've started the documentation effort at http://techbase.kde.org/Getting_Started/Sources/KDE_git-tutorial
I recommend reading the Git Parable linked there, it will help you make sense of the complex (yet surprisingly simple) parts of a distributed version control system like git. This is clearly a work in progress. My goal is to have this at a very high quality before the rest of KDE switches to git. You guys are the test audience and collaborators. I'm sure some of you are a lot better with git then me. I've only done one commit to gitorious so far, though once set up the process is very similar to git-svn. Bart On Sun, Jul 19, 2009 at 7:12 PM, Jeff Mitchell<[email protected]> wrote: > Hey guys, > > As of r999404, SVN is closed for commits on extragear/multimedia/amarok. > Read-only. > > Thiago is currently doing an rsync and will attempt the conversion. If > it fails he'll have to do it tomorrow; in this case I'll ask toma to > remove the read-only restriction until then and will let you all know. > > I want to lay out a couple ground rules for our Git repo on Gitorious: > > 1) Never, ever create a branch in our mainline repo. Ever. You can do it > locally, but do *not* push it up. > 2) Clone the repo and work on that. Add mainline as a remote branch in > your local copy of your cloned repo. This will allow you to easily merge > back and forth. Bart will work on the documentation for this and send it > around. > 3) Pushing branches to your own clone of the mainline repo is fine, > however, if you are doing bugfixing or feature branches, use *ONE BRANCH > PER FEATURE/BUGFIX*. Gitorious will hopefully improve, but right now it > has a downfall in that you can only merge from the start of a branch up > to a selected end-point; you can't cherry-pick start and stop points. So > if you work on feature A and merge it, then feature B, and want to merge > in feature B, you'll have to merge from the start of the branch. So for > now at least, just use one branch per feature/bugfix. > > That's the golden three. I think. Unless Ian remembers something I'm > forgetting. > > More to come from Bart. > > --Jeff > > > _______________________________________________ > Amarok-devel mailing list > [email protected] > https://mail.kde.org/mailman/listinfo/amarok-devel > > _______________________________________________ Kde-scm-interest mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-scm-interest
