Grokbase
Topics Posts Groups | in
x
[ help ]

Re: git workflow (was Re: git?)

View PostFlat  Thread  Threaded | < Prev - Next >
A. Pagaltzis Re: git workflow (was Re: git?)
| +1 vote
[ Profile | Reply to group ] [ Flat  Thread  Threaded ]
* Craig A. Berry <craig.a.berry@gmail.com> [2008-11-15 19:30]:
> On Fri, Nov 14, 2008 at 11:43 AM, demerphq <demerphq@gmail.com> wrote:
> > Git is the TMTOWDTI of version control systems. The reason
> > there are a lot of handwaving in the answers you get is
> > because there is no "right" answer to your questions.
>
> I understand that, but it doesn't mean I have to like it. It's
> a lot like trying to get a recipe from a master chef when you
> are hungry: […] Our cookbook needs to be "Meals in a Minute,"
> not Julia Childs' "The Way to Cook."

Please understand that this is because p5p has not picked a git
workflow yet. Git lets you pick pretty nearly any workflow you
like so the question on the table right now is “what workflow do
we on p5p want to establish?� In contrast, the question a
newcomer to p5p will eventually encounter is “how do I fit myself
into p5p’s workflow?�, which will be a very much easier to answer
question for which we will have a _Patches in a Minute_ rather
than handing out _The Way of Git_.

> IMO, without a good, Perl-specific cheat sheet, we are somewhat
> ill-prepared for the git transition. I will do what I can to
> help, but I'm short on both tuits and expertise to write such a
> document.

The current situation is complicated by the fact that many main
“stakeholders� have not had time to familiarise themselves with
git such that they already know their options, leading to the
long discussions that you see. (I am not saying that this is a
bad thing! I am rather pointing out that it is to be expected and
completely natural.) Please do not be alarmed at how broadly the
debate is meandering; this is merely a phase. It is a normal part
of establishing cooperation using a DVCS, and the discussion is
as intense as it is merely because many people are having it as
they are learning about DVCS in the first place. If everyone were
familiar with DVCS, consensus would be reached very much faster,
but at this time it’s a novel concept to many.

In short: relax. :-)

Furthermore, just as git does not impose any particular workflow,
it does not impose it at any one time; by which I mean to say,
you can always change it or make additions or adjustments later.
This also means a group of contributors can always use a
different workflow amongst themselves, and as a whole still
integrate into the main project workflow.

Got that? What I am trying to say here is: we don’t have to get
everything completely perfect straight away. So there is no need
to worry there either.

Again: relax. :-)

This will all become clearer once you start using git. It’s a lot
less overwhelming than might seem right now from the outside.

> But no one should have to know anything about how git works
> internally in order to track a couple of branches of Perl and
> submit their changes back. If they do, that's a fail.

Actually, this I’ll *sorta* disagree with. The fundamental git
data model is exposed very directly in git. Though you do not
need to know it in order to follow a cheat sheet or if others
tell you what to do, you will need an understanding of it to do
anything interesting of your own device. The analogy to baby-talk
Perl that someone else made is very apt here. Realise however
that the git data model is extraordinarily simple.

Then, there are all the clever ways in which git’s implementation
exploits the git data model in order to be fast. (Eg. it does
some very smart things to produce diffs between enormous trees
in milliseconds.) Knowing git internals at this level is not
necessary to use it.

Regards,
--
Aristotle Pagaltzis // <http://plasmasturm.org/>

Thread : git workflow (was Re: git?)
1)
David Golden More importantly, there are no instructions yet on what the "workflow" should be. Git supports...
2)
Nicholas Clark Fail: With this, there is no way to have people set up automated smokers on to. Smoking on things...
3)
David Golden Not necessarily Fail. Decentralized doesn't have to mean uncoordinated. The "master" Perl...
4)
Craig Berry It's on my to-do list. I got it close to working before 5.10.0, but there were always more pressing...
5)
A. Pagaltzis Don’t see why not. Smokers can pull from multiple remotes into a single mirror repo as easily as...
6)
Nicholas Clark Sure, and that strikes me as a recipe for chaos. We'll get a smoke report, and then we have to work...
7)
Jesse It would be rather neat to autosmoke anything that's sent to p5p as a pull-notice or a patch,...
8)
A. Pagaltzis No no no. I said nothing about merging. Fetching from multiple repos does nothing more than convert...
9)
demerphq 2008/11/16 Aristotle Pagaltzis <pagaltzis@gmx.de>: You said "smokers can PULL from multiple...
10)
A. Pagaltzis Yes, sorry. I find “fetch� kind of awkward when used in informal context, since “pull� is a...
11)
Craig Berry And there's more than one workflow. Before I commit back to the repository, I have to know how to...
12)
Tux If you have X11, the most user-friendly next step is 'git-gui' After the clone, you just...
13)
David Golden You're pushing the limits of my git-fu, but I think one way to handle this is to always work in...
14)
demerphq 2008/11/14 Craig A. Berry <craig.a.berry@gmail.com>: You can have multiple working directories. See...
15)
Craig Berry I understand that, but it doesn't mean I have to like it. It's a lot like trying to get a recipe...
16)
Chris Prather Craig, Yeah, it's a lot like approaching Perl for the first time by dropping into an advanced...
17)
demerphq 2008/11/15 Craig A. Berry <craig.a.berry@gmail.com>: Sorry, I didn't realize this question was...
18)
demerphq 2008/11/15 demerphq <demerphq@gmail.com>: I view this as the difference in learning that a...
19)
Leon Brocard 2008/11/15 Craig A. Berry <craig.a.berry@gmail.com>: I'm thinking of sections along the lines of:...
20)
David Golden -- David
21)
Rafael Garcia-Suarez 2008/11/16 L=E9on Brocard <acme@astray.com>: git log, gitk, gitgui... p So what would be the...
22)
A. Pagaltzis Please understand that this is because p5p has not picked a git workflow yet. Git lets you pick...
23)
Nicholas Clark Great. That makes the answer really easy: RIGHT NOW we go for exactly the same workflow as we're...
24)
A. Pagaltzis That is not going to *entirely* work because git is not the same as Perforce and the centralised...
25)
Nicholas Clark Ah OK Right. This makes sense. So to me, right now, the useful assistance I'd like would be to have...
26)
Tux Something else to consider in using hashes in .patch, is that not all smokers smoke at the same...
27)
David Golden As a starting point, I ported Yuval's "git for perforce users" to the perl5 wiki:...
28)
demerphq 2008/11/16 Nicholas Clark <nick@ccl4.org>: Afaik it is basically the same, except you dont have to...
29)
Chris Prather So based on questions asked on IRC, I whipped up the following and rand it past Sam Vilain (SamV...
30)
Rafael Garcia-Suarez 2008/11/14 David Golden <xdaveg@gmail.com>: Given the "polylithic" nature of the perl sources --...
spacer
View PostFlat  Thread  Threaded | < Prev - Next >