Sent: 2009-04-20 10:46:07 UTC (almost 3 years ago)

From: Michael Schumacher

GIMP & git - example workflows from some of our longer-term git users?

permalink

Hi,

as you may have noticed (or will notice soon, at least when svn does become more and more outdated), GNOME is moving its source code repository from SVN to GIT.

GIT should be available on all major platforms - via the package managers of most Linux distributions, and installers for Mac OS X (http://code.google.com/p/git-osx-installer/) and Microsoft Windows (http://code.google.com/p/tortoisegit/)

However, most people will be inexperienced with using git, especially if they try to follow the "best practice" of a distributed revision control system - having 'git pull' tell you that it doesn't know what to pull from isn't that reassuring, at least.

So we need an example workflow from someone who is already comfortable with git. A description that starts right at the first 'git clone' and includes the creation of a local branch(?), and the committing changes for others to see.

This will be interesting especially for Summer of Code, as we usually want to have students their own branches, but preferably not local ones.

Regards,
Michael

--
Psssst! Schon vom neuen GMX MultiMessenger gehört? Der kann`s mit allen: http://www.gmx.net/de/go/multimessenger01
_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2009-04-20 19:55:42 UTC (almost 3 years ago)

From: Martin Nordholts

GIMP & git - example workflows from some of our longer-term git users?

permalink

Michael Schumacher wrote:
> we need an example workflow from someone who is already comfortable with git. A description that starts right at the first 'git clone' and includes the creation of a local branch(?), and the committing changes for others to see.
>

Hi

Yes, GNOME has moved to git. This includes in particular babl, GEGL and
GIMP.

I don't think there is a need to reiterate a how-to on this mailing list
for how to work with git. It should be quite enough to read:
http://live.gnome.org/Git/Developers

and other git resources on the web. GIMP will not have a super-special
workflow with regards to git. In fact, there is no workflow set in stone
yet, we will have to experiment to wee what works and what doesn't.

(This is also a reply to David)

- Martin

_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2009-04-22 11:45:27 UTC (almost 3 years ago)

From: Nils Philippsen

GIMP & git - example workflows from some of our longer-term git users?

permalink

On Mon, 2009-04-20 at 19:56 +0200, Martin Nordholts wrote:
> I don't think there is a need to reiterate a how-to on this mailing list
> for how to work with git. It should be quite enough to read:
> http://live.gnome.org/Git/Developers
>
> and other git resources on the web. GIMP will not have a super-special
> workflow with regards to git. In fact, there is no workflow set in stone
> yet, we will have to experiment to wee what works and what doesn't.

Just a caveat since this isn't mentioned on the web page: Rebasing
changes on a branch modifies history, so don't rebase changes that are
publicly visible. Use rebasing only for your private changes which you
haven't pushed yet.

Nils

--
Nils Philippsen / Wilhelmstraße 22 / D-71229 Leonberg
nils@tiptoe.de / nils@redhat.com
PGP fingerprint: C4A8 9474 5C4C ADE3 2B8F 656D 47D8 9B65 6951 3011
Ever noticed that common sense isn't really all that common?

_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2009-04-22 12:03:05 UTC (almost 3 years ago)

From: Michael Schumacher

GIMP & git - example workflows from some of our longer-term git users?

permalink

> Von: Nils Philippsen

> On Mon, 2009-04-20 at 19:56 +0200, Martin Nordholts wrote:
> > I don't think there is a need to reiterate a how-to on this mailing list
> > for how to work with git. It should be quite enough to read:
> > http://live.gnome.org/Git/Developers
> >
> > and other git resources on the web. GIMP will not have a super-special
> > workflow with regards to git. In fact, there is no workflow set in stone
> > yet, we will have to experiment to wee what works and what doesn't.
>
> Just a caveat since this isn't mentioned on the web page: Rebasing
> changes on a branch modifies history, so don't rebase changes that are
> publicly visible. Use rebasing only for your private changes which you
> haven't pushed yet.

See, it's things like that that I would like to see mentioned more frequently and accompanied by the actual git commands (if possible).

Michael

--
Neu: GMX FreeDSL Komplettanschluss mit DSL 6.000 Flatrate + Telefonanschluss für nur 17,95 Euro/mtl.!* http://dslspecial.gmx.de/freedsl-surfflat/?ac=OM.AD.PD003K11308T4569a
_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2009-04-23 13:34:16 UTC (almost 3 years ago)

From: Nils Philippsen

GIMP & git - example workflows from some of our longer-term git users?

permalink

On Wed, 2009-04-22 at 12:03 +0200, Michael Schumacher wrote:
> > Von: Nils Philippsen
>
> > On Mon, 2009-04-20 at 19:56 +0200, Martin Nordholts wrote:
> > > I don't think there is a need to reiterate a how-to on this mailing list
> > > for how to work with git. It should be quite enough to read:
> > > http://live.gnome.org/Git/Developers
> > >
> > > and other git resources on the web. GIMP will not have a super-special
> > > workflow with regards to git. In fact, there is no workflow set in stone
> > > yet, we will have to experiment to wee what works and what doesn't.
> >
> > Just a caveat since this isn't mentioned on the web page: Rebasing
> > changes on a branch modifies history, so don't rebase changes that are
> > publicly visible. Use rebasing only for your private changes which you
> > haven't pushed yet.
>
> See, it's things like that that I would like to see mentioned more
> frequently and accompanied by the actual git commands (if possible).

So where do you want it documented, I'll gladly write this up (with
actual commands).

Nils

--
Nils Philippsen / Wilhelmstraße 22 / D-71229 Leonberg
nils@tiptoe.de / nils@redhat.com
PGP fingerprint: C4A8 9474 5C4C ADE3 2B8F 656D 47D8 9B65 6951 3011
Ever noticed that common sense isn't really all that common?

_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2009-04-25 17:17:47 UTC (almost 3 years ago)

From: Ruben Vermeersch

GIMP & git - example workflows from some of our longer-term git users?

permalink

On Thu, 2009-04-23 at 13:34 +0200, Nils Philippsen wrote:
> On Wed, 2009-04-22 at 12:03 +0200, Michael Schumacher wrote:
> > > Von: Nils Philippsen
> >
> > > On Mon, 2009-04-20 at 19:56 +0200, Martin Nordholts wrote:
> > > > I don't think there is a need to reiterate a how-to on this mailing list
> > > > for how to work with git. It should be quite enough to read:
> > > > http://live.gnome.org/Git/Developers
> > > >
> > > > and other git resources on the web. GIMP will not have a super-special
> > > > workflow with regards to git. In fact, there is no workflow set in stone
> > > > yet, we will have to experiment to wee what works and what doesn't.
> > >
> > > Just a caveat since this isn't mentioned on the web page: Rebasing
> > > changes on a branch modifies history, so don't rebase changes that are
> > > publicly visible. Use rebasing only for your private changes which you
> > > haven't pushed yet.
> >
> > See, it's things like that that I would like to see mentioned more
> > frequently and accompanied by the actual git commands (if possible).
>
> So where do you want it documented, I'll gladly write this up (with
> actual commands).

Let's keep it all in one place: http://live.gnome.org/Git and subpages
are where this kind of stuff belongs.

Cheers,
Ruben

--
Ruben Vermeersch (rubenv)
http://www.savanne.be/

_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2009-04-26 02:44:06 UTC (almost 3 years ago)

From: Nils Philippsen

GIMP & git - example workflows from some of our longer-term git users?

permalink

On Sat, 2009-04-25 at 17:17 +0200, Ruben Vermeersch wrote:
> On Thu, 2009-04-23 at 13:34 +0200, Nils Philippsen wrote:
> > On Wed, 2009-04-22 at 12:03 +0200, Michael Schumacher wrote:
> > > > Von: Nils Philippsen
> > >
> > > > On Mon, 2009-04-20 at 19:56 +0200, Martin Nordholts wrote:
> > > > > I don't think there is a need to reiterate a how-to on this mailing list
> > > > > for how to work with git. It should be quite enough to read:
> > > > > http://live.gnome.org/Git/Developers
> > > > >
> > > > > and other git resources on the web. GIMP will not have a super-special
> > > > > workflow with regards to git. In fact, there is no workflow set in stone
> > > > > yet, we will have to experiment to wee what works and what doesn't.
> > > >
> > > > Just a caveat since this isn't mentioned on the web page: Rebasing
> > > > changes on a branch modifies history, so don't rebase changes that are
> > > > publicly visible. Use rebasing only for your private changes which you
> > > > haven't pushed yet.
> > >
> > > See, it's things like that that I would like to see mentioned more
> > > frequently and accompanied by the actual git commands (if possible).
> >
> > So where do you want it documented, I'll gladly write this up (with
> > actual commands).
>
> Let's keep it all in one place: http://live.gnome.org/Git and subpages
> are where this kind of stuff belongs.

Okay, let's hope I can get something done until mid next week, I'll be
on vacation from then on for 3 weeks and will likely have low to no net
access.

Nils

--
Nils Philippsen / Wilhelmstraße 22 / D-71229 Leonberg
nils@tiptoe.de / nils@redhat.com
PGP fingerprint: C4A8 9474 5C4C ADE3 2B8F 656D 47D8 9B65 6951 3011
Ever noticed that common sense isn't really all that common?
_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer