Re: [gentoo-dev] On git and pushing official gentoo branches

Re: [gentoo-dev] On git and pushing official gentoo branches

[William Hubbs]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Gilles,

On Sun, Apr 26, 2009 at 11:55:55PM +0200, Gilles Dartiguelongue wrote:
> As many of you might already know, gnome switched to git about 2 weeks
> ago so I'd like to take a pick at what people do concerning upstream
> using git. How do you present patches you maintain for gentoo to
> upstream ? Own maintained git server, gentoo hosted git, others ?

Take a look at git format-patch.  You can put your local changes on a
local branch and create patches that would be able to be merged very
easily upstream.  Or you can just use git diff to create patches to
email upstream.

- -- 
William Hubbs
gentoo accessibility team lead
williamh@gentoo.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)

iEYEARECAAYFAkn0xQgACgkQblQW9DDEZTgDCQCgjruR5O+qZihvyRks77B8f6fo
VaIAn1uyNIRdwJaKVaTEG/yzWahBj/R2
=FdHj
-----END PGP SIGNATURE-----

[gentoo-dev] On git and pushing official gentoo branches

[Gilles Dartiguelongue]

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

Hello list,

As many of you might already know, gnome switched to git about 2 weeks
ago so I'd like to take a pick at what people do concerning upstream
using git. How do you present patches you maintain for gentoo to
upstream ? Own maintained git server, gentoo hosted git, others ?

-- 
Gilles Dartiguelongue <eva@gentoo.org>
Gentoo

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [gentoo-dev] On git and pushing official gentoo branches

[Rémi Cardona]

Le 26/04/2009 23:55, Gilles Dartiguelongue a écrit :
> Hello list,
>
> As many of you might already know, gnome switched to git about 2 weeks
> ago so I'd like to take a pick at what people do concerning upstream
> using git. How do you present patches you maintain for gentoo to
> upstream ? Own maintained git server, gentoo hosted git, others ?

I've been thinking about something similar for most of X and 
FreeDesktop's packages which are pretty much all hosted using git as well.

Ideally, something like Ubuntu's Launchpad's DVCS capabilities would 
help. But that's probably wishful thinking on my part.

Cheers,

Rémi

Re: [gentoo-dev] On git and pushing official gentoo branches

[Gilles Dartiguelongue]

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

Le dimanche 26 avril 2009 à 15:33 -0500, William Hubbs a écrit :
> Hi Gilles,
> 
> On Sun, Apr 26, 2009 at 11:55:55PM +0200, Gilles Dartiguelongue wrote:
> > As many of you might already know, gnome switched to git about 2 weeks
> > ago so I'd like to take a pick at what people do concerning upstream
> > using git. How do you present patches you maintain for gentoo to
> > upstream ? Own maintained git server, gentoo hosted git, others ?
> 
> Take a look at git format-patch.  You can put your local changes on a
> local branch and create patches that would be able to be merged very
> easily upstream.  Or you can just use git diff to create patches to
> email upstream.

Well I'm more looking into giving upstream the possibility to pick what
we've done by a single git cherry-pick or merge. format-patch works
well, it's what I'm using to keep patches in sync with upstream changes
but what I'm really looking for is a way to say to upstream "look,
that's where patches for your project are hold in gentoo land, come and
pick everything you think is worth it" (sure I can point to
sources.gentoo.org but that's not what I'm looking for).

-- 
Gilles Dartiguelongue <eva@gentoo.org>
Gentoo

[-- Attachment #2: Ceci est une partie de message numériquement signée --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [gentoo-dev] On git and pushing official gentoo branches

[Donnie Berkholz]

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

On 01:15 Mon 27 Apr     , Gilles Dartiguelongue wrote:
> Well I'm more looking into giving upstream the possibility to pick 
> what we've done by a single git cherry-pick or merge. format-patch 
> works well, it's what I'm using to keep patches in sync with upstream 
> changes but what I'm really looking for is a way to say to upstream 
> "look, that's where patches for your project are hold in gentoo land, 
> come and pick everything you think is worth it" (sure I can point to 
> sources.gentoo.org but that's not what I'm looking for).

Ideally we could have vendor branches on the upstream git repo. It 
doesn't get any easier to find than that.

Another option is to have a Gentoo-only repository. I think the best 
approach for upstream is to have topic branches (each branch only has 
patches related to one feature). A somewhat easier approach for us is to 
just stick all the Gentoo patches on a single branch forked off the 
upstream branch.

We could host repos on a Gentoo git server, a la 
<http://git.overlays.gentoo.org/gitweb/?p=proj/xserver.git;a=summary>. 
If you scroll down to the bottom, you'll see a branch called 
server-1.5-branch-exa-backports that can be compared with the upstream 
server-1.5-branch.

See vcs-pkg.org for all kinds of ideas about how to handle this.

-- 
Thanks,
Donnie

Donnie Berkholz
Developer, Gentoo Linux
Blog: http://dberkholz.wordpress.com

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: [gentoo-dev] On git and pushing official gentoo branches

[Caleb Cushing]

2009/4/26 Gilles Dartiguelongue <eva@gentoo.org>:
> Well I'm more looking into giving upstream the possibility to pick what
> we've done by a single git cherry-pick or merge. format-patch works
> well, it's what I'm using to keep patches in sync with upstream changes
> but what I'm really looking for is a way to say to upstream "look,
> that's where patches for your project are hold in gentoo land, come and
> pick everything you think is worth it" (sure I can point to
> sources.gentoo.org but that's not what I'm looking for).

you could also use sendemail to send them... or one of the other
mailing options.


-- 
Caleb Cushing

http://xenoterracide.blogspot.com