On Wed, Nov 11, 2009 at 5:57 AM, Russell Keith-Magee <freakboy3...@gmail.com> wrote: > > On Wed, Nov 11, 2009 at 1:06 AM, mrts <mrts.py...@gmail.com> wrote: >> >> Great news! Have you discussed the workflow yet? >> I.e. will a DVCS be involved, and if yes, will there be >> a central repo for coordinating the effort? >> >> A special repo on Github would otherwise be perfect, >> but as mentioned before, we have a problem with re-forking: >> http://support.github.com/discussions/feature-requests/560-two-forks-of-a-single-repo
Even presuming you want to use git for collaboration in this way, I fail to see why you need to have two repos both called django, or similar. Github seems to encourage you to fork through them because that helps them manage fork queues, but unless I'm missing something, it's perfectly OK to make a repo called django-sprint-dallas-200912 and push up the regular django repo there, then use that as your merge point. (I sometimes worry that sites like github and bitbucket gloss over the fundamentals and make you think that they offer some core feature -- they are nice, but DVCS works without some magick site service in the middle. Github is git-daemon + social networking + some handy utilities.) Bringing stuff back into the main django repo doesn't have to be done through github's fork queue-- it's really not too hard to see what is unmerged once you've fetched in a remote: git clone git://github.com/django/django.git django-sprint (make a shared sprint repo on github, perhaps django-sprint-location-date, e.g. django-sprint-dallas-200912) git remote add merge-point g...@github.com:jdunck/django-sprint-dallas-200912.git git checkout -b upstream-master origin/master #just for easy reference git push merge-point upstream-master:master #so everyone starts at the same place git checkout -b jdunck-feature-A upstream-master (do some local work, merging with sprint collaborators, but keeping a separate branch per ticket or feature) Want to see what other have done? Add their repos as remotes, and fetch them: git remote add mrts-sprint g...@github.com:mrts/django-sprint.git git fetch mrts-sprint Want to see what mrts has done that I haven't merged yet? git log mrts-sprint/pet-feature --not sprint-work OK, if that looks good, I can pull it into the blessed sprint repo: git branch mrts-pet-feature mrts-sprint/peg-feature git push merge-point mrts-pet-feature:done-mrts-pet-feature --------- At the end of the day, though, you're still going to make trac patches (unless a core is willing to accept patches from django-sprint*/done-* repo branches). -- You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-develop...@googlegroups.com. To unsubscribe from this group, send email to django-developers+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-developers?hl=en.
