[Buildroot] HEADS UP: svn->git transition

[Buildroot] HEADS UP: svn->git transition

[Bernhard Reutner-Fischer]

Hi,

We will be switching to git (instead of svn) for our repositories.
Svn will be frozen during the conversion which is scheduled to begin
on wednesday (10am, probably PDT which is approximately GMT-7).

[Buildroot] HEADS UP: svn->git transition

[Gaye Abdoulaye Walsimou]

Bernd Schmidt wrote:
> Bernhard Reutner-Fischer wrote:
>
>> We will be switching to git (instead of svn) for our repositories.
>
> Any particular reason?
>
> As far as I know, git works on local repositories.  How will we get
> things committed into a mainline repository?

git pull <remote_repository>
>
>
> Bernd


-- 
"Il est absolument possible qu'au del? de ce que per?oivent nos sens, se cachent des mondes
insoup?onn?s": Albert Einstein - cf Th?orie de la relativit?.
Le?on a tir? en sciences comme ailleurs: Ne jamais se fier aux apparences.

[Buildroot] HEADS UP: svn->git transition

[Gaye Abdoulaye Walsimou]

Josh Boyer wrote:
> On Wed, Apr 29, 2009 at 02:55:47PM +0200, Gaye Abdoulaye Walsimou wrote:
>   
>> Bernd Schmidt wrote:
>>     
>>> Bernhard Reutner-Fischer wrote:
>>>
>>>       
>>>> We will be switching to git (instead of svn) for our repositories.
>>>>         
>>> Any particular reason?
>>>
>>> As far as I know, git works on local repositories.  How will we get
>>> things committed into a mainline repository?
>>>       
>> git pull <remote_repository>
>>     
>
> That's the opposite of what Bernd asked.  Or, depending on the context,
> only 1/2 of what he asked.
>
> Presumably you'll have a primary repo somewhere, and the maintainer(s)
> of that project will do pull from developer's repositories into their
> own local copies.  After vetting changes, the maintainer(s) will do a
> 'git push' to the primary public repo.
>
> josh
>   
My apologies, I misread Bernd, of course:

git clone <remote_repository> <local_repository>
git clone <remote_repository>

after changes...

git commit

git push

-- 
"Il est absolument possible qu'au del? de ce que per?oivent nos sens, se cachent des mondes
insoup?onn?s": Albert Einstein - cf Th?orie de la relativit?.
Le?on a tir? en sciences comme ailleurs: Ne jamais se fier aux apparences.

[Buildroot] HEADS UP: svn->git transition

[Peter Korsgaard]

>>>>> "Josh" == Josh Boyer <jwboyer@gmail.com> writes:

Hi,

 Josh> Presumably you'll have a primary repo somewhere, and the
 Josh> maintainer(s) of that project will do pull from developer's
 Josh> repositories into their own local copies.  After vetting
 Josh> changes, the maintainer(s) will do a 'git push' to the primary
 Josh> public repo.

Indeed. See http://git.buildroot.net for the cgit interface to the
official repositories (the final sync with svn is still to be done).

I wrote a mail with some more details about it on the buildroot list
last month:

http://lists.busybox.net/pipermail/buildroot/2009-March/026875.html

-- 
Bye, Peter Korsgaard

[Buildroot] HEADS UP: svn->git transition

[Bernhard Reutner-Fischer]

On Wed, Apr 29, 2009 at 02:49:39PM +0100, Bernd Schmidt wrote:
> Bernhard Reutner-Fischer wrote:
>
>> We will be switching to git (instead of svn) for our repositories.
>
> Any particular reason?

I've asked a couple of folks and they too found git easier to use.
Benefits in my POV include:
- bisect. Makes it easy to track down a regression
- easier merging between a couple of branches
- convenient git-am to apply patches from email
etc.

> As far as I know, git works on local repositories.  How will we get  
> things committed into a mainline repository?

git push -v --thin git+ssh://$USERNAME at uclibc.org/srv/git/uClibc.git
Paths will differ a bit, i will update the developer instructions on the
webpage accordingly.

[Buildroot] HEADS UP: svn->git transition

[Asbjoern Laurberg]

Bernhard Reutner-Fischer wrote:
> On Wed, Apr 29, 2009 at 02:49:39PM +0100, Bernd Schmidt wrote:
>> Bernhard Reutner-Fischer wrote:
>>
>>> We will be switching to git (instead of svn) for our repositories.
>> Any particular reason?
> 
> I've asked a couple of folks and they too found git easier to use.

I agree. Git instead of SVN gives many advantages. And when you have 
learned to use Git (it takes some time though) it is easy to use.

Best regards,
Asbjoern Laurberg
Development Engineer
Thrane & Thrane A/S

[Buildroot] HEADS UP: svn->git transition

[Bernhard Reutner-Fischer]

On Wed, Apr 29, 2009 at 01:38:49PM +0200, Bernhard Reutner-Fischer wrote:
>Hi,
>
>We will be switching to git (instead of svn) for our repositories.
>Svn will be frozen during the conversion which is scheduled to begin

Correction:
thursday, 10 AM PDT
$ date -u -d 'thursday 10 AM PDT'
Thu Apr 30 17:00:00 UTC 2009

sorry for the confusion..

[Buildroot] HEADS UP: svn->git transition

[Peter Korsgaard]

>>>>> "Denys" == Denys Vlasenko <vda.linux@googlemail.com> writes:

Hi,

 Denys> git clone git+ssh://vda at busybox.net/var/lib/git/busybox.git

 Denys> clones some oldish tree.

Yes, from March 17th. Did you miss the mail thread from last month
with Ian from osuosl.org?

-- 
Bye, Peter Korsgaard

[Buildroot] HEADS UP: svn->git transition

[Peter Korsgaard]

>>>>> "Denys" == Denys Vlasenko <vda.linux@googlemail.com> writes:

Hi,

 Denys> Do you expect every single member of the mailing list
 Denys> to track that? I have no doubts that I can spend a few hours
 Denys> and figure out where the new git tree is, and how to use it.

Mailing list? You were one of the 5 or so people directly in the to/cc.

 Denys> That's not my point. My point is that this information
 Denys> is not *easily* accessible.
 Denys> We might be pissing off our users.

So why didn't you do anything about it in the last month?

-- 
Bye, Peter Korsgaard

[Buildroot] HEADS UP: svn->git transition

[Peter Korsgaard]

>>>>> "Denys" == Denys Vlasenko <vda.linux@googlemail.com> writes:

Hi,

 Denys> Which email are you referring to?

Ehm, the mails between us and osuosl.org staff about switching the
uclibc.org projects from svn to git. The first mail was afaik:

From: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Subject: uClibc: switching from svn to git
To: support at osuosl.org
Cc: vapier at gentoo.org, solar at gentoo.org, vda.linux at googlemail.com,
	jacmet at uclibc.org
Date: Wed, 18 Feb 2009 21:16:54 +0100

Did you never read them?

 >> So why didn't you do anything about it in the last month?

 Denys> I didn't do anything because I am not a person which performs
 Denys> svn->git migration. I am just one of svn users (which happens
 Denys> to have write access too).

.. And busybox maintainer.

 Denys> So far I read all relevant emails and I do not see instructions
 Denys> how can I check out new tree. (I will also need instructions
 Denys> how to push/commit/latest_fashionable_term_of_the_week_for_it
 Denys> changes).

Again, my mail to the buildroot list described the setup for BR. I
don't quite know how you will do it for busybox / uclibc, but the
basic stuff stays the same.

To quote:

The repo can be browsed through cgit at:

http://git.buildroot.net/buildroot/

It can be cloned anonymously using:

git clone git://git.buildroot.net/buildroot/ or
git clone http://git.buildroot.net/buildroot/ if you're behind a
firwall blocking git access.

Developers can also access the repo over ssh with:

git clone ssh://uclibc.org/var/lib/git/buildroot.git

replace buildroot with busybox or uclibc and you should be good to go.

 Denys> Such instructions can't possibly be longer than 2 to 5 lines.
 Denys> This is the minimum necessary for users and developers to migrate.
 Denys> If I missed an email which contains them, I apoligize.

More like 73 mails ;)

-- 
Bye, Peter Korsgaard

[Buildroot] HEADS UP: svn->git transition

[Gaye Abdoulaye Walsimou]

> Busybox svn has been migrated to git.
>
> I check out fresh tree with:
>
> git clone git+ssh://vda at busybox.net/var/lib/git/busybox.git
>
> Then in that tree I can do:
>
> git pull          -- analog of "svn update"
> git add new_file  -- IIUC this is "svn add" analog
> git commit -a     -- create a local change which includes all files
>                      modified since last commit.
>   

You can add -s :

git commit -a -s

In order to have a "Signed-off-by" added automatically.