Started migration to git

1 2 3 next »

Alexey Zakhlestine

Started migration to git
Thu May 20 2010 17:30:12 UTC
I finished all internal tweaks and tests and it seems to work.

So, right now, I am submitting projects to github.

I didn't enforce read-only mode in subversion, so I just ask anyone to abstain from committing to any of midgard2/midgard3 branches.

Instructions on "new world order" will be in following emails :)

--
Alexey Zakhlestin
Nemein - Web Craftsmanship
http://nemein.com

_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply
Alexey Zakhlestine

Re: [midgard-dev] Started migration to git
Thu May 20 2010 19:10:06 UTC
On 20.05.2010, at 21:26, Alexey Zakhlestin wrote:

> Instructions on "new world order" will be in following emails :)

Here we go

The official umbrella-user of Midgard Project: http://github.com/midgardproject

Follow it at github if you want to know about organisational changes, such as:
* creation of new sub-project
* change of sub-project maintainers

Current list of maintainers:

bergie:
- midgardmvc_*

indeyets:
- midgard-php5

mdk:
- midgard-runtime

piotras:
- midgard-core
- midgard-c-plus-plus
- midgard-python
- midgard-vala
- midgard-mono

Development process:

1) Noone (including maintainers) ever commits changes to midgardproject's repositories directly
2) All development happens in cloned repository of user
3) Maintainer merges commits from repositories of other users into _his_own_ repository and tests
changes
4) Whenever maintainer feels, that changes are safe and ready for prime-time he pushes them to
midgardproject's repository

Suggested workflow.

Git allows to create local branches easily thus allowing to use "Feature Branches" approach. It
works like this.

0) Fork midgardproject's repository at github and "git clone" it to your computer
1) Create local branch:
git checkout -b cool-feature
2) Do necessary changes, committing as much as you need (it is fast and you always can revert any
commits)
3) Test your changes ;)

4) After this, you have several options:
A) Rebase
git checkout master
git rebase cool-feature

pro: easy
contra: all your small commits with errors-and-fixes will go to midgard's repository.

B) Groupped cherry-picking
Analyze your changes using "git log" and "git diff" commands (or gui tools)

git checkout master

Then get several commits from branch, which you want to group
git cherry-pick -n someuid123 # -n flag gets patch from branch without committing it
Followed by
git commit -a -m 'your group commit description'

Repeat as much times as needed.

pro: commits will be presented in a nice fashion, without any garbage-changes
contra: more work

4) Delete feature-branch (all necessary commits are already in your master-branch)
git branch -d cool-feature

4) Push changes to your github-fork:
git push origin master

5) Notify sub-project maintainer about your changes using gihub's "pull request" or using any other
method which both of you like

Useful GUI tools:

Cross-platform:
git-gui (bundled with git) http://www.kernel.org/pub/software/scm/git/docs/git-gui.html

Mac OS X:
GitX http://gitx.frim.nl/

Gnome:
Giggle http://live.gnome.org/giggle

--
Alexey Zakhlestin
Nemein - Web Craftsmanship
http://nemein.com

_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply
Alexey Zakhlestine

Re: [midgard-dev] Started migration to git
Thu May 20 2010 19:45:05 UTC
On 20.05.2010, at 21:26, Alexey Zakhlestin wrote:

> I didn't enforce read-only mode in subversion, so I just ask anyone to abstain from committing to any of midgard2/midgard3 branches.

ok. read-only mode is enforced for all branches except ragnaroek now.

SVN admins (piotras,bergie,rambo) still have full read-write access.
Please, be careful. Any new commits to svn will not appear in git (unless you manually recommit them)

Things TODO:

1) Setup some project for release-tools and OBS-tools
Discussion is welcome

2) Implement webhooks in trac, so that github can notify it about commits, which fix/ref/reopen bugs
There is trac-plugin here: http://wiki.github.com/davglass/github-trac/
Who's brave enough to setup it? ;)

3) Fix release-process instruction
This is mine, I guess, but I can easily step aside and let anyone else do it.

Some notes on release-process (relates to #1 and #3 from the list):

We switch to a bit more decentralised model of releases now.
When time comes, release-master (currently this is piotras) will tell maintainers, that they should prepare for release.
Maintainers have to prepare/choose stable revision of their component and mark it with release-tag ("10.11.0" for example).

Then, when all maintainers do this, release-master starts script, which gets tagged revisions as tar.gz-files from github and works with them.

--
Alexey Zakhlestin
Nemein - Web Craftsmanship
http://nemein.com

_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply
Alexey Zakhlestine

Re: [midgard-dev] Started migration to git
Thu May 20 2010 19:50:06 UTC
On 20.05.2010, at 23:39, Alexey Zakhlestin wrote:

> Things TODO:
>
> 1) Setup some project for release-tools and OBS-tools
> Discussion is welcome
>
> 2) Implement webhooks in trac, so that github can notify it about commits, which fix/ref/reopen bugs
> There is trac-plugin here: http://wiki.github.com/davglass/github-trac/
> Who's brave enough to setup it? ;)
>
> 3) Fix release-process instruction
> This is mine, I guess, but I can easily step aside and let anyone else do it.

4) Write some README-files for all sub-projects (so, that they look nice at github)
This is up to the maintainers of sub-projects

--
Alexey Zakhlestin
Nemein - Web Craftsmanship
http://nemein.com

_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply
Piotr Pokora

Re: [midgard-dev] Started migration to git
Thu May 20 2010 21:05:04 UTC
Hi!

> 1) Setup some project for release-tools and OBS-tools
> Discussion is welcome

OBS upload script looks (more or less) like this:

svn co url/to/branch/midgard
cd midgard
./obs_makedist

obs_makedist is provided by branch itself, and it should be updated only
there.

All is fine, as long as branch is available anonymously with unique url.

> 2) Implement webhooks in trac, so that github can notify it about commits, which fix/ref/reopen bugs
> There is trac-plugin here: http://wiki.github.com/davglass/github-trac/
> Who's brave enough to setup it? ;)
>
> 3) Fix release-process instruction
> This is mine, I guess, but I can easily step aside and let anyone else do it.

Basically what should be updated is info about creating new branches and
release tags.

Piotras
_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply
Piotr Pokora

Re: [midgard-dev] Started migration to git
Fri May 21 2010 07:30:05 UTC
Hi!

> 3) Fix release-process instruction
> This is mine, I guess, but I can easily step aside and let anyone else do it.

I just realized we do not have an "entry point" which containt makedist,
Makefile, release_howto, etc.
How this one should be resolved?
It's needed per branch.

Piotras
_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply
Alexey Zakhlestine

Re: [midgard-dev] Started migration to git
Fri May 21 2010 08:25:05 UTC
We'll need some kind of midgard-support-tools repository for that.
I'll create it as soon as I will get back to computer.

Choose some name, create structure which feels right locally as git-
repository with several branches. You'll be able to push it later

p.s. I'm sorry for top-posting. I'm writing from phone

21.05.2010, × 11:26, Piotr Pokora <piotrek.pokora@gmail.com> ÎÁÐÉÓÁÌ(Á):

> Hi!
>
>> 3) Fix release-process instruction
>> This is mine, I guess, but I can easily step aside and let anyone
>> else do it.
>
> I just realized we do not have an "entry point" which containt
> makedist,
> Makefile, release_howto, etc.
> How this one should be resolved?
> It's needed per branch.
>
> Piotras
> _______________________________________________
> dev mailing list
> dev@lists.midgard-project.org
> http://lists.midgard-project.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply
Alexey Zakhlestine

Re: [midgard-dev] Started migration to git
Fri May 21 2010 11:25:05 UTC
On 21.05.2010, at 12:24, Alexey Zakhlestin wrote:

> We'll need some kind of midgard-support-tools repository for that. I'll create it as soon as I will get back to computer.

I created http://github.com/midgardproject/midgard-support-tools repository and gave commit-access to:

* bergie
* indeyets
* jval
* piotras
* rambo

Rules are not strict for this repository direct commits are allowed.

I started to implement pake-script for creating "nightly" builds in this repository.

--
Alexey Zakhlestin
Nemein - Web Craftsmanship
http://nemein.com

_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply
Piotr Pokora

Re: [midgard-dev] Started migration to git
Thu May 27 2010 08:00:06 UTC
> I created http://github.com/midgardproject/midgard-support-tools repository and gave commit-access to:

I need write access to everything.
I can not ask/whatever this or that guy to do something to make/test
builds/release etc.

Piotras
_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply
Piotr Pokora

Re: [midgard-dev] Started migration to git
Thu May 27 2010 08:05:06 UTC
>
> I created http://github.com/midgardproject/midgard-support-tools repository and gave commit-access to:

How can I make changes to core, all packages and distro files in one
commit and make it atomic?

Piotras
_______________________________________________
dev mailing list
dev@lists.midgard-project.org
http://lists.midgard-project.org/mailman/listinfo/dev
- Reply

1 2 3 next »