ETA on git conversion

ETA on git conversion

[Holger Freyther]

Hey,

we would like to switch to git by next wednesday. Jan Lübbe went through the 
hassle to fix two issues in my mtn2git.py and we are happy with the metadata 
and can even unite it with the data exported from bitkeeper.

The plans would be:
	- Send your public ssh keys if you have not done so

Tuesday:
	- Set monotone readonly 16h german time
	- merge the multiple heads (if they exist)
	- Try to add the revs from now to tuesday to git

Wednesday:
	- Be back up with git and use that as primary system.
	- Disable monotone completely


Things to note:
	The history will be different from the trial. You will need to 
git-rebase --from trial-head --to official-head or just git-reset to get to 
the official head.

Thanks to Jan for wrestling with monotone, git, the script and the data and we 
will keep you informed about how the migration is going.

comments

z.

Re: ETA on git conversion

[Khem Raj]

On Tue, Oct 7, 2008 at 10:51 PM, Holger Freyther <zecke@selfish.org> wrote:
> Hey,
>
> we would like to switch to git by next wednesday. Jan Lübbe went through the
> hassle to fix two issues in my mtn2git.py and we are happy with the metadata
> and can even unite it with the data exported from bitkeeper.
>
> The plans would be:
>        - Send your public ssh keys if you have not done so
>
> Tuesday:
>        - Set monotone readonly 16h german time
>        - merge the multiple heads (if they exist)
>        - Try to add the revs from now to tuesday to git
>
> Wednesday:
>        - Be back up with git and use that as primary system.
>        - Disable monotone completely
>
>
> Things to note:
>        The history will be different from the trial. You will need to
> git-rebase --from trial-head --to official-head or just git-reset to get to
> the official head.
>
> Thanks to Jan for wrestling with monotone, git, the script and the data and we
> will keep you informed about how the migration is going.
>
> comments

Great job!!
if we are ready then dont wait till next week. We can use this time to
stabilize on git.

Thx

-Khem
>
> z.
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>

Re: ETA on git conversion

[Tom Rini]

On Wed, Oct 08, 2008 at 12:10:55AM -0700, Khem Raj wrote:
> On Tue, Oct 7, 2008 at 10:51 PM, Holger Freyther <zecke@selfish.org> wrote:
> > Hey,
> >
> > we would like to switch to git by next wednesday. Jan Lübbe went through the
> > hassle to fix two issues in my mtn2git.py and we are happy with the metadata
> > and can even unite it with the data exported from bitkeeper.
> >
> > The plans would be:
> >        - Send your public ssh keys if you have not done so
> >
> > Tuesday:
> >        - Set monotone readonly 16h german time
> >        - merge the multiple heads (if they exist)
> >        - Try to add the revs from now to tuesday to git
> >
> > Wednesday:
> >        - Be back up with git and use that as primary system.
> >        - Disable monotone completely
> >
> >
> > Things to note:
> >        The history will be different from the trial. You will need to
> > git-rebase --from trial-head --to official-head or just git-reset to get to
> > the official head.
> >
> > Thanks to Jan for wrestling with monotone, git, the script and the data and we
> > will keep you informed about how the migration is going.
> >
> > comments
> 
> Great job!!

Indeed!

> if we are ready then dont wait till next week. We can use this time to
> stabilize on git.

Think of now until read-only as a last call for "push your outstanding
changes already" :)

... looking forward to seeing if moving to git makes getting patches in
any easier.

-- 
Tom Rini

Re: ETA on git conversion

[Koen Kooi]

On 08-10-2008 07:51, Holger Freyther wrote:
> Hey,
>
> we would like to switch to git by next wednesday. Jan Lübbe went through the
> hassle to fix two issues in my mtn2git.py and we are happy with the metadata
> and can even unite it with the data exported from bitkeeper.

Where's the OE git phrasebook mapping mtn commands to git ones? You 
can't seriously mean to switch without such a document in the wiki.

regards,

Koen

Re: ETA on git conversion

[Philip Balister]

[-- Attachment #1: Type: text/plain, Size: 619 bytes --]

Koen Kooi wrote:
> On 08-10-2008 07:51, Holger Freyther wrote:
>> Hey,
>>
>> we would like to switch to git by next wednesday. Jan Lübbe went 
>> through the
>> hassle to fix two issues in my mtn2git.py and we are happy with the 
>> metadata
>> and can even unite it with the data exported from bitkeeper.
> 
> Where's the OE git phrasebook mapping mtn commands to git ones? You 
> can't seriously mean to switch without such a document in the wiki.

I'm pretty much screwed without a git phrasebook. Git and me are not 
getting along :) I really do not want to accidentally commit rubbish.

Philip


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]

Re: ETA on git conversion

[Michael Krelin]

> 
> I'm pretty much screwed without a git phrasebook. Git and me are not 
> getting along :) I really do not want to accidentally commit rubbish.
> 

The good thing about git is that you can *easily* review your committed 
rubbish before pushing it to the public ;-)

Love,
H

Re: ETA on git conversion

[Holger Freyther]

On Wednesday 08 October 2008 10:07:38 Koen Kooi wrote:
> On 08-10-2008 07:51, Holger Freyther wrote:
> > Hey,
> >
> > we would like to switch to git by next wednesday. Jan Lübbe went through
> > the hassle to fix two issues in my mtn2git.py and we are happy with the
> > metadata and can even unite it with the data exported from bitkeeper.
>
> Where's the OE git phrasebook mapping mtn commands to git ones? You
> can't seriously mean to switch without such a document in the wiki.

got a link? I tried to search wiki.oe.net for mtn and monotone phrasebook but 
didn't find anything. :)

z.

Re: ETA on git conversion

[Koen Kooi]

On 08-10-2008 13:03, Holger Freyther wrote:
> On Wednesday 08 October 2008 10:07:38 Koen Kooi wrote:
>> On 08-10-2008 07:51, Holger Freyther wrote:
>>> Hey,
>>>
>>> we would like to switch to git by next wednesday. Jan Lübbe went through
>>> the hassle to fix two issues in my mtn2git.py and we are happy with the
>>> metadata and can even unite it with the data exported from bitkeeper.
>> Where's the OE git phrasebook mapping mtn commands to git ones? You
>> can't seriously mean to switch without such a document in the wiki.
>
> got a link? I tried to search wiki.oe.net for mtn and monotone phrasebook but
> didn't find anything. :)

The old wiki had one, dunno if the new wiki overlords decided to move it 
to the new wiki. Ask them.


>
> z.
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: ETA on git conversion

[Leon Woestenberg]

Hello,

On Wed, Oct 8, 2008 at 1:18 PM, Koen Kooi <k.kooi@student.utwente.nl> wrote:
> On 08-10-2008 13:03, Holger Freyther wrote:
>> On Wednesday 08 October 2008 10:07:38 Koen Kooi wrote:
>>> On 08-10-2008 07:51, Holger Freyther wrote:
>>>>
>>>> we would like to switch to git by next wednesday. Jan Lübbe went through
>>>> the hassle to fix two issues in my mtn2git.py and we are happy with the
>>>> metadata and can even unite it with the data exported from bitkeeper.
>>>
Thanks for all the efforts.

Regarding the GIT phrasebook, as a starter:

I assume the GIT ssh public key must be generated with SSH, and not
some git (sub) command?


Regards,
-- 
Leon

Re: ETA on git conversion

[Philip Balister]

[-- Attachment #1: Type: text/plain, Size: 777 bytes --]

Leon Woestenberg wrote:
> Hello,
> 
> On Wed, Oct 8, 2008 at 1:18 PM, Koen Kooi <k.kooi@student.utwente.nl> wrote:
>> On 08-10-2008 13:03, Holger Freyther wrote:
>>> On Wednesday 08 October 2008 10:07:38 Koen Kooi wrote:
>>>> On 08-10-2008 07:51, Holger Freyther wrote:
>>>>> we would like to switch to git by next wednesday. Jan Lübbe went through
>>>>> the hassle to fix two issues in my mtn2git.py and we are happy with the
>>>>> metadata and can even unite it with the data exported from bitkeeper.
> Thanks for all the efforts.
> 
> Regarding the GIT phrasebook, as a starter:
> 
> I assume the GIT ssh public key must be generated with SSH, and not
> some git (sub) command?

Do you mind if I use the public key I use for other OE services?

Philip


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]

Re: ETA on git conversion

[Holger Freyther]

On Wednesday 08 October 2008 13:18:16 Koen Kooi wrote:

>
> The old wiki had one, dunno if the new wiki overlords decided to move it
> to the new wiki. Ask them.

http://wiki.openembedded.net/index.php/GitPhraseBook

is this any good?

z.

Re: ETA on git conversion

[Michael Krelin]

> On Wednesday 08 October 2008 13:18:16 Koen Kooi wrote:
> 
>> The old wiki had one, dunno if the new wiki overlords decided to move it
>> to the new wiki. Ask them.
> 
> http://wiki.openembedded.net/index.php/GitPhraseBook
> 
> is this any good?

IMO, more than a hacker may be asked for ;-)

A few notes, though - you only mention `git clone git:`, not sure where 
would push remotes come from for subsequent push commands.

How about adding `git config`s instead of --color and stuff? Of course, 
it's fine to leave it for user's exercise ;-)

Love,
H

> 
> z.
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Re: ETA on git conversion

[Koen Kooi]

On 08-10-2008 17:57, Holger Freyther wrote:
> On Wednesday 08 October 2008 13:18:16 Koen Kooi wrote:
>
>> The old wiki had one, dunno if the new wiki overlords decided to move it
>> to the new wiki. Ask them.
>
> http://wiki.openembedded.net/index.php/GitPhraseBook
>
> is this any good?

It's a start, but make sure people can paste the actual commands, so 
don't comments in the textbox:

Bad:

  git pull --rebase -- Conflicts from here or something else

Better:

  git pull --rebase # Conflicts from here or something else

Even better:
  # use --rebase to work out conflicts from here or something else
  git pull --rebase

regards,

Koen


>
> z.

Re: ETA on git conversion

[Philip Balister]

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

Holger Freyther wrote:
> On Wednesday 08 October 2008 13:18:16 Koen Kooi wrote:
> 
>> The old wiki had one, dunno if the new wiki overlords decided to move it
>> to the new wiki. Ask them.
> 
> http://wiki.openembedded.net/index.php/GitPhraseBook
> 
> is this any good?

Yes, very good. I agree with Koen about the comments "git pull --rebase" 
looks funny given the use of -- for comments.

I'm sure we'll break something in it, but this should get me to the 
point I can figure out what breaks :)

Philip


> 
> z.
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
> 

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/x-pkcs7-signature, Size: 3303 bytes --]

Re: ETA on git conversion

[Rod Whitby]

Holger Freyther wrote:
> On Wednesday 08 October 2008 13:18:16 Koen Kooi wrote:
> 
>> The old wiki had one, dunno if the new wiki overlords decided to move it
>> to the new wiki. Ask them.
> 
> http://wiki.openembedded.net/index.php/GitPhraseBook
> 
> is this any good?

Some comments (open for discussion before I change the wiki page):

> git clone git://git.openembedded.net/FIXME openembedded.git

Does it need to create openembedded.git as the directory name rather
than just openembedded?

> git config user.name "Your Name"
> git config user.mail "you@name"

Do we want to use the --global flag so that the scope of these commands
covers all git repos for that user and they don't forget to do it for
every new repo they clone?

> git commit --amend

Add a comment that this should only be done on commits that have not
been pushed anywhere, and should *never* be done on commits that have
been pushed to a public repo?


BTW, the git commands that I've been using for FSO work can be found in
the FSO Makefile at http://downloads.freesmartphone.org/Makefile

In particular, this is how I clone the OE trial git repo:

> .PHONY: setup-openembedded
> .PRECIOUS: openembedded/.git/config
> setup-openembedded openembedded/.git/config:
> 	[ -e openembedded/.git/config ] || \
> 	( git clone git://git.openembedded.net/org.openembedded.dev openembedded ; \
> 	  cd openembedded ; \
> 	  git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*' )
> 	( cd openembedded && \
> 	  ( git branch | egrep -e ' org.openembedded.dev$$' > /dev/null || \
> 	    git checkout -b org.openembedded.dev --track origin/org.openembedded.dev ))
> 	( cd openembedded && git checkout org.openembedded.dev )
> 	touch openembedded/.git/config

Comments on that strategy are welcome.
Generic prejudices about Makefiles are not :-)

-- Rod

git and branches

[Sledz, Steffen]

As an OE beginner I'm a bit confused with the different branches. Is there an overview about all the branches available in the new git system. I made some searches in wiki.openembedded.net but could not found really helpful info.

'git branch -r' lists these branches:

  origin/HEAD
  origin/master
  origin/org.openembedded.dev
  origin/org.openembedded.documentation
  origin/org.openembedded.dreambox
  origin/org.openembedded.entity
  origin/org.openembedded.stable
  origin/org.openmoko.april-update
  origin/org.openmoko.dev
  origin/org.openmoko.xora.qtopia
  origin/org.openmoko.zecke.april-update
  origin/org.openmoko.zecke.autotools-bustage
  origin/org.openmoko.zecke.random-breakage

<http://wiki.openembedded.net/index.php/DevelopmentBranches> lists these ones (without any description :( ):

  org.nslu2-linux.bitbake
  org.nslu2-linux.dev
  org.openembedded.dev
  org.openembedded.documentation
  org.openembedded.dreambox
  org.openembedded.oetest
  org.openembedded.oz354fam083
  org.openembedded.oz354x
  org.openembedded.packaged-staging
  org.openembedded.stable

'master' ist used as the default when getting the data with 'git clone git://git.openembedded.net/org.openembedded.dev' like described on <http://wiki.openembedded.net/index.php/Git#OpenEmbedded_Git_repository>. But what branch is 'master'? And which branches should one use for which purposes?

Steffen

Re: git and branches

[Denys Dmytriyenko]

On Thu, Oct 09, 2008 at 11:39:18AM +0200, Sledz, Steffen wrote:
> As an OE beginner I'm a bit confused with the different branches. Is there an overview about all the branches available in the new git system. I made some searches in wiki.openembedded.net but could not found really helpful info.
> 
> 'git branch -r' lists these branches:
> 
>   origin/HEAD
>   origin/master
>   origin/org.openembedded.dev
>   origin/org.openembedded.documentation
>   origin/org.openembedded.dreambox
>   origin/org.openembedded.entity
>   origin/org.openembedded.stable
>   origin/org.openmoko.april-update
>   origin/org.openmoko.dev
>   origin/org.openmoko.xora.qtopia
>   origin/org.openmoko.zecke.april-update
>   origin/org.openmoko.zecke.autotools-bustage
>   origin/org.openmoko.zecke.random-breakage
> 
> <http://wiki.openembedded.net/index.php/DevelopmentBranches> lists these ones (without any description :( ):
> 
>   org.nslu2-linux.bitbake
>   org.nslu2-linux.dev
>   org.openembedded.dev
>   org.openembedded.documentation
>   org.openembedded.dreambox
>   org.openembedded.oetest
>   org.openembedded.oz354fam083
>   org.openembedded.oz354x
>   org.openembedded.packaged-staging
>   org.openembedded.stable
> 
> 'master' ist used as the default when getting the data with 'git clone git://git.openembedded.net/org.openembedded.dev' like described on <http://wiki.openembedded.net/index.php/Git#OpenEmbedded_Git_repository>. But what branch is 'master'? And which branches should one use for which purposes?

Please don't hijack threads - replying with the new Subject usually does not 
create a new thread.

As was discussed earlier, master was just another name for 
org.openembedded.dev branch, which is checked out now by default.

.dev is where all the latest development occurs, while .stable is the branch 
supposedly good enough for production, i.e. for day to day use by end users.

-- 
Denys

Re: git and branches

[Rod Whitby]

Sledz, Steffen wrote:
> As an OE beginner I'm a bit confused with the different branches. Is there an overview about all the branches available in the new git system. I made some searches in wiki.openembedded.net but could not found really helpful info.
> 
> <http://wiki.openembedded.net/index.php/DevelopmentBranches> lists these ones (without any description :( ):
> 
>   org.nslu2-linux.bitbake
>   org.nslu2-linux.dev

I've removed these from that wiki page, since they are not supposed to
be on OpenEmbedded servers.

-- Rod

Re: ETA on git conversion

[Jonas Bonn]

>> git clone git://git.openembedded.net/FIXME openembedded.git
>
> Does it need to create openembedded.git as the directory name rather
> than just openembedded?

Convention is to use the .git extension for "bare" repositories and
not for a working directory as you would be creating with git-clone.
If you clone from an xxx.git repository, the working directory will be
called just "xxx" if you don't specify anything else.

>
>> git config user.name "Your Name"
>> git config user.mail "you@name"
>
> Do we want to use the --global flag so that the scope of these commands
> covers all git repos for that user and they don't forget to do it for
> every new repo they clone?

Yes, this is a good idea, in my opinion.

>
>> git commit --amend
>
> Add a comment that this should only be done on commits that have not
> been pushed anywhere, and should *never* be done on commits that have
> been pushed to a public repo?
>

I imagine the public repo is set up to only allow fast-forwards... in
this case the user won't be able to push at all if they do an --amend
on commit that's already in the repository.

>>       ( git clone git://git.openembedded.net/org.openembedded.dev openembedded ; \
>>         cd openembedded ; \
>>         git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*' )

No, this doesn't look right...  you should not be fetching the
"remote" repository's remotes.  You should only be grabbing the
"heads" from the remote repo.  But maybe you had a reason for doing
this...???
Otherwise, the following is the usual mantra:
git config --add remote.origin.fetch '+refs/heads/*:refs/remotes/*'
...but this is also the default that git-clone sets up fpr you, so no
need to do it explicitly.

>>       ( cd openembedded && \
>>         ( git branch | egrep -e ' org.openembedded.dev$$' > /dev/null || \
>>           git checkout -b org.openembedded.dev --track origin/org.openembedded.dev ))
>>       ( cd openembedded && git checkout org.openembedded.dev )
>>       touch openembedded/.git/config
>

/Jonas

Re: ETA on git conversion

[Marcin Juszkiewicz]

Wednesday 08 of October 2008 07:51:15 Holger Freyther napisał(a):

> we would like to switch to git by next wednesday. Jan Lübbe went
> through the hassle to fix two issues in my mtn2git.py and we are
> happy with the metadata and can even unite it with the data exported
> from bitkeeper.

> The plans would be:
> 	- Send your public ssh keys if you have not done so

Send them to who? Mickeyl, Koen, Holger, Richard or someone other?

> Tuesday:
> 	- Set monotone readonly 16h german time
> 	- merge the multiple heads (if they exist)
> 	- Try to add the revs from now to tuesday to git

> Wednesday:
> 	- Be back up with git and use that as primary system.
> 	- Disable monotone completely

I would suggest leaving monotone read-only for two weeks so people will 
have a time to switch. Also adding file like README-THIS-IS-NOT-UPDATED-
SINCE-WE-SWITCHED-TO-GIT with some info would be nice.

> Thanks to Jan for wrestling with monotone, git, the script and the
> data and we will keep you informed about how the migration is going.

Thanks to all people envolved into this switch. My contributions to OE 
were smaller last time due to my work on Poky but now, when we will be 
using git I plan to merge some interesting stuff to the OE (my monotone 
knowledge is smaller then it was year ago).

-- 
JID: hrw@jabber.org

Re: ETA on git conversion

[Koen Kooi]

On 08-10-2008 12:10, Marcin Juszkiewicz wrote:
> Wednesday 08 of October 2008 07:51:15 Holger Freyther napisał(a):
>
>> we would like to switch to git by next wednesday. Jan Lübbe went
>> through the hassle to fix two issues in my mtn2git.py and we are
>> happy with the metadata and can even unite it with the data exported
>> from bitkeeper.
>
>> The plans would be:
>> 	- Send your public ssh keys if you have not done so
>
> Send them to who? Mickeyl, Koen, Holger, Richard or someone other?

As was said only 7 days ago, on this very list:

http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-October/006291.html

We have received a grand total of 14 git keys since then.

regards,

Koen

>
>> Tuesday:
>> 	- Set monotone readonly 16h german time
>> 	- merge the multiple heads (if they exist)
>> 	- Try to add the revs from now to tuesday to git
>
>> Wednesday:
>> 	- Be back up with git and use that as primary system.
>> 	- Disable monotone completely
>
> I would suggest leaving monotone read-only for two weeks so people will
> have a time to switch. Also adding file like README-THIS-IS-NOT-UPDATED-
> SINCE-WE-SWITCHED-TO-GIT with some info would be nice.
>
>> Thanks to Jan for wrestling with monotone, git, the script and the
>> data and we will keep you informed about how the migration is going.
>
> Thanks to all people envolved into this switch. My contributions to OE
> were smaller last time due to my work on Poky but now, when we will be
> using git I plan to merge some interesting stuff to the OE (my monotone
> knowledge is smaller then it was year ago).
>

Re: ETA on git conversion

[Otavio Salvador]

Holger Freyther <zecke@selfish.org> writes:

> Thanks to Jan for wrestling with monotone, git, the script and the data and we 
> will keep you informed about how the migration is going.

Thanks to you all by all this migration work.

-- 
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: otavio@debian.org      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
 you the whole house."

Re: ETA on git conversion

[Holger Freyther]

On Wednesday 08 October 2008 07:51:15 Holger Freyther wrote:
> Hey,
>
> we would like to switch to git by next wednesday. Jan Lübbe went through
> the hassle to fix two issues in my mtn2git.py and we are happy with the
> metadata and can even unite it with the data exported from bitkeeper.
>
> The plans would be:
> 	- Send your public ssh keys if you have not done so
>
> Tuesday:
> 	- Set monotone readonly 16h german time
> 	- merge the multiple heads (if they exist)
> 	- Try to add the revs from now to tuesday to git


Okay monotone.oe.org is read-only now.

z.

Re: ETA on git conversion

[Holger Freyther]

On Wednesday 08 October 2008 07:51:15 Holger Freyther wrote:

> Wednesday:
> 	- Be back up with git and use that as primary system.
> 	- Disable monotone completely

1.) git user account created
2.) gitosis setup
3.) keys added and permissions added (see the end of the mail)
4.) populated the repository with content
5.) git-daemon is serving data
6.) push/pull with git ssh works
7.) notifications should work too
8.) the GitPhraseBook got updated with the final git location
9.) gitweb is nice and even tells you which URL to use
10.) mail almost sent

I think the conversion is complete and we can disable the mtn servers now or 
leave them readonly for a while.


Notes to people with commit access:
git clone git@git.openembedded.net:openembedded to get the tree

Notes to people:
	DO NOT MERGE the old trial history and this history. We have no commit hook 
yet to prevent this and solely depend on common sense...


Notes to people using the trial git:
  git-remote add new-origin git://git.openembedded.net/openembedded
  git-fetch new-origin
  git-rebase --onto new-origin/org.openembedded.dev 
origin/org.openembedded.dev org.openembedded.dev (if i got this right from 
the manpage)



Thins for the near future:
Remove the nslu2 branches once nslu2 folks have migrated to git as well and 
created repositories for them.

Consider renaming the branches, I kind of like the names though




People with push access:
	cbrake.pub
	crofton.pub
	daniel_willman.pub
	dirk_opfer.pub
	felix_domke.pub
	florian_boor.txt
	henning_heinold.pub
	hrw.pub
	jan_luebbe.pub
	john_lee.pub
	khem_raj1.pub
	khem_raj2.pub
	koen.pub
	leon_woestenberg.pub
	mickeyl.pub
	mustafa_yuecel.pub
	mwester.pub
	otavio_salvador.pub
	paul_eggleton.pub
	phillip_zabel.pub
	robert_schuster.pub
	rodrigo_vivi.pub
	rolf.pub
	rpurdie.pub
	rwhitby.pub
	shane_volpe.pub
	stanislav_brabec.pub
	thomas_kunze.pub
	xora.pub
	zecke.pub

Re: ETA on git conversion

[Rodrigo Vivi]

Hi Holger,

Great news!
Great job!

Thank you very much for your efforts on this migration.

On Tue, Oct 14, 2008 at 6:41 PM, Holger Freyther <zecke@selfish.org> wrote:
> On Wednesday 08 October 2008 07:51:15 Holger Freyther wrote:
>
>> Wednesday:
>>       - Be back up with git and use that as primary system.
>>       - Disable monotone completely
>
> 1.) git user account created
> 2.) gitosis setup
> 3.) keys added and permissions added (see the end of the mail)
> 4.) populated the repository with content
> 5.) git-daemon is serving data
> 6.) push/pull with git ssh works
> 7.) notifications should work too
> 8.) the GitPhraseBook got updated with the final git location
> 9.) gitweb is nice and even tells you which URL to use
> 10.) mail almost sent
>
> I think the conversion is complete and we can disable the mtn servers now or
> leave them readonly for a while.
>
>
> Notes to people with commit access:
> git clone git@git.openembedded.net:openembedded to get the tree
>
> Notes to people:
>        DO NOT MERGE the old trial history and this history. We have no commit hook
> yet to prevent this and solely depend on common sense...
>
>
> Notes to people using the trial git:
>  git-remote add new-origin git://git.openembedded.net/openembedded
>  git-fetch new-origin
>  git-rebase --onto new-origin/org.openembedded.dev
> origin/org.openembedded.dev org.openembedded.dev (if i got this right from
> the manpage)
>
>
>
> Thins for the near future:
> Remove the nslu2 branches once nslu2 folks have migrated to git as well and
> created repositories for them.
>
> Consider renaming the branches, I kind of like the names though
>
>
>
>
> People with push access:
>        cbrake.pub
>        crofton.pub
>        daniel_willman.pub
>        dirk_opfer.pub
>        felix_domke.pub
>        florian_boor.txt
>        henning_heinold.pub
>        hrw.pub
>        jan_luebbe.pub
>        john_lee.pub
>        khem_raj1.pub
>        khem_raj2.pub
>        koen.pub
>        leon_woestenberg.pub
>        mickeyl.pub
>        mustafa_yuecel.pub
>        mwester.pub
>        otavio_salvador.pub
>        paul_eggleton.pub
>        phillip_zabel.pub
>        robert_schuster.pub
>        rodrigo_vivi.pub
>        rolf.pub
>        rpurdie.pub
>        rwhitby.pub
>        shane_volpe.pub
>        stanislav_brabec.pub
>        thomas_kunze.pub
>        xora.pub
>        zecke.pub
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>



-- 
Rodrigo Vivi
INdT - Instituto Nokia de Tecnologia
Blog: http://blog.vivi.eng.br
GPG: 0x905BE242 @ wwwkeys.pgp.net

Re: ETA on git conversion

[Rod Whitby]

Holger Freyther wrote:
> I think the conversion is complete and we can disable the mtn servers now or 
> leave them readonly for a while.

Thanks to all involved for completing the transition.

Thanks to mwester for making monotone.nslu2-linux.org readonly while I
slept.

> Notes to people with commit access:
> git clone git@git.openembedded.net:openembedded to get the tree
> 
> Notes to people:
> 	DO NOT MERGE the old trial history and this history. We have no commit hook 
> yet to prevent this and solely depend on common sense...

I will put explicit checks in any Makefiles I maintain before I release
updates that use git, to ensure that this cannot happen using one of my
Makefiles.

> Notes to people using the trial git:
>   git-remote add new-origin git://git.openembedded.net/openembedded
>   git-fetch new-origin
>   git-rebase --onto new-origin/org.openembedded.dev 
> origin/org.openembedded.dev org.openembedded.dev (if i got this right from 
> the manpage)

(If it's not there already) Can we put this on the phrasebook page?

> Thins for the near future:
> Remove the nslu2 branches once nslu2 folks have migrated to git as well and 
> created repositories for them.

Please remove all org.nslu2-linux branches from the git.openembedded.net
server immediately.  They were never meant to end up on an OE server
anyway (and the Makefiles specifically prevented this, so someone must
have done it manually by accident).

-- Rod

Re: ETA on git conversion

[Rod Whitby]

Rod Whitby wrote:
> Please remove all org.nslu2-linux branches from the git.openembedded.net
> server immediately.  They were never meant to end up on an OE server
> anyway (and the Makefiles specifically prevented this, so someone must
> have done it manually by accident).

I tried to do it myself, but (correctly) got rejected:

> rwhitby@take:/home/slug/openembedded$ git push git@git.openembedded.net:openembedded :heads/org.nslu2-linux.bitbake
> *** Deleting a branch is not allowed in this repository
> To git@git.openembedded.net:openembedded
>  ! [remote rejected] org.nslu2-linux.bitbake (hook declined)
> error: hooks/update exited with error code 1
> error: hook declined to update refs/heads/org.nslu2-linux.bitbake
> error: failed to push some refs to 'git@git.openembedded.net:openembedded'
> rwhitby@take:/home/slug/openembedded$ git push git@git.openembedded.net:openembedded :heads/org.nslu2-linux.dev
> *** Deleting a branch is not allowed in this repository
> To git@git.openembedded.net:openembedded
>  ! [remote rejected] org.nslu2-linux.dev (hook declined)
> error: hooks/update exited with error code 1
> error: hook declined to update refs/heads/org.nslu2-linux.dev
> error: failed to push some refs to 'git@git.openembedded.net:openembedded'
> rwhitby@take:/home/slug/openembedded$

A good hook to have!  Nicely done.

-- Rod

Re: ETA on git conversion

[Uli Luckas]

> On Wednesday 08 October 2008 07:51:15 Holger Freyther wrote:
> > Wednesday:
> > 	- Be back up with git and use that as primary system.
> > 	- Disable monotone completely
>
> 1.) git user account created
> 2.) gitosis setup
> 3.) keys added and permissions added (see the end of the mail)
> 4.) populated the repository with content
> 5.) git-daemon is serving data
> 6.) push/pull with git ssh works
> 7.) notifications should work too
> 8.) the GitPhraseBook got updated with the final git location
> 9.) gitweb is nice and even tells you which URL to use
> 10.) mail almost sent
>
> I think the conversion is complete and we can disable the mtn servers now
> or leave them readonly for a while.
>
To Holger and all involved, here is my big "thank you".

Uli

Re: ETA on git conversion

[Mark Brown]

On Tue, Oct 14, 2008 at 11:41:06PM +0200, Holger Freyther wrote:

> I think the conversion is complete and we can disable the mtn servers now or 
> leave them readonly for a while.

Please let me know when you want to disable the Wolfson mtn mirror.

FWIW, I've set up a git mirror (updated once per day) though as much for
my own convenience as anything else.