Go to main content

Textpattern CMS support forum

You are not logged in. Register | Login | Help

#16 2014-10-05 05:55:53

phiw13
Plugin Author
From: South-Western Japan
Registered: 2004-02-27
Posts: 3,649
Website

Re: Textpattern moves to Git and GitHub

Stef, Pete, do you know any tutorial about git & github? I know all the cool kids are saying that it is fairly easy but it remains to be seen if that is the case for cool-grumpy old men like me.
(I’m reasonably familiar with SVN and Mercurial, and use the latter for tracking personal projects)


Where is that emoji for a solar powered submarine when you need it ?
Sand space – admin theme for Textpattern
phiw13 on Codeberg

Offline

#17 2014-10-05 08:18:05

CeBe
Plugin Author
From: Caen - Fr
Registered: 2010-06-25
Posts: 345
Website

Re: Textpattern moves to Git and GitHub

A book that helped me a lot: Git Reference.
You may want to start directly from chapter 2.

Offline

#18 2014-10-05 08:32:39

philwareham
Core designer
From: Haslemere, Surrey, UK
Registered: 2009-06-11
Posts: 3,565
Website GitHub Mastodon

Re: Textpattern moves to Git and GitHub

Also bear in mind that branches of Textpatterm might not be too stable, or even guaranteed to become part of the master trunk. It’s where we do development work in progress. Still, feel free to run and test and contribute to them though.

Offline

#19 2014-10-05 09:02:38

phiw13
Plugin Author
From: South-Western Japan
Registered: 2004-02-27
Posts: 3,649
Website

Re: Textpattern moves to Git and GitHub

@CeBe – thanks!


Where is that emoji for a solar powered submarine when you need it ?
Sand space – admin theme for Textpattern
phiw13 on Codeberg

Offline

#20 2014-10-05 20:24:39

jakob
Admin
From: Germany
Registered: 2005-01-20
Posts: 5,204
Website GitHub

Re: Textpattern moves to Git and GitHub

And another free tutorial: www.git-tower.com/learn


TXP Builders – finely-crafted code, design and txp

Offline

#21 2014-10-06 07:28:19

trenc
Plugin Author
From: ⛵️, currently Göteborg, SE
Registered: 2008-02-27
Posts: 574
Website GitHub

Re: Textpattern moves to Git and GitHub

Ok. After moving to Github I received ~ 2000 mails with all issues and updates of https://github.com/textpattern/textpattern. :)


Digital nomad, sailing the world on a sailboat: 32fthome.com

Offline

#22 2014-10-06 08:50:20

philwareham
Core designer
From: Haslemere, Surrey, UK
Registered: 2009-06-11
Posts: 3,565
Website GitHub Mastodon

Re: Textpattern moves to Git and GitHub

trenc wrote #284561:

Ok. After moving to Github I received ~ 2000 mails

Yep, me too, unfortunately that was the only way to migrate the issues from Google Code to GitHub. Sorry, it should settle down now it’s moved.

Offline

#23 2014-10-07 07:11:13

trenc
Plugin Author
From: ⛵️, currently Göteborg, SE
Registered: 2008-02-27
Posts: 574
Website GitHub

Re: Textpattern moves to Git and GitHub

No problem, I just wondered. I’m glad it’s now on GitHub.


Digital nomad, sailing the world on a sailboat: 32fthome.com

Offline

#24 2014-10-09 15:58:42

mrdale
Member
From: Walla Walla
Registered: 2004-11-19
Posts: 2,215
Website

Re: Textpattern moves to Git and GitHub

I’m glad it’s on github for more visibility and perhaps more widespread contribution…

One thing I’ll miss is a simple revision number, i.e., “4432” instead of “0d1d7fc32” which made zipping back and forth between revisions, a snap…

used to be svn update -r 4432 (4432 is clearly a smaller numbher than 4444 or 4938)

but now it’s gonna be more like git reset --hard 0d1d7fc32

Ah well… All for the best. Still don’t understand why they didn’t set git up with some concurrent simple sequential numbers for submits even if they are just for dislay.

Offline

#25 2014-10-09 16:00:56

wet
Developer Emeritus
From: Vöcklabruck, Austria
Registered: 2005-06-06
Posts: 3,421
Website GitHub Mastodon

Re: Textpattern moves to Git and GitHub

mrdale wrote #284641:

Still don’t understand why they didn’t set git up with some concurrent simple sequential numbers…

On a distributed system, who will be the sequence keeper?

Offline

#26 2014-10-09 16:52:14

mrdale
Member
From: Walla Walla
Registered: 2004-11-19
Posts: 2,215
Website

Re: Textpattern moves to Git and GitHub

Quoth Wet: On a distributed system, who will be the sequence keeper?

Meh, each of those entries is presumably stored in a database, what’s wrong with a simple index id? Like bitbucket or svn.

Don’t care that much, but a redundant simple number for dummies might be nice in addition to that admittedly badass hex string… Hell maybe the hex string could be even longer, 1024 characters anyone?

Offline

#27 2014-10-09 19:37:11

Bloke
Developer
From: Leeds, UK
Registered: 2006-01-29
Posts: 12,458
Website GitHub

Re: Textpattern moves to Git and GitHub

mrdale wrote #284644:

maybe the hex string could be even longer, 1024 characters anyone?

To be fair, you only need to use as much of the string as necessary to ensure uniqueness. The first 8 usually suffice.

git reset —hard 0d1d7fc32

What would you be doing that for? Under the many branches paradigm which we’re adopting there should be very little reason to go back and forth between revisions. Stuff in master is what we consider ‘stable’(ish). After your initial clone, you keep up-to-date with the master by using git pull. That’s it.

Every other feature we’re working on (a.k.a. experimental or unfinished) goes in a different branch. If you want to try it out, you git checkout name-of-branch and bam, your local repo looks exactly like the feature branch. If you don’t like it or it doesn’t work to your liking, git checkout master and everything rolls back to how you had it, instantly. Then you can make noise on the feature branch issue list about what you did/didn’t like and things move forward. When the branch is in a ready state, it’s merged back into master.


The smd plugin menagerie — for when you need one more gribble of power from Textpattern. Bleeding-edge code available on GitHub.

Hire Txp Builders – finely-crafted code, design and Txp

Online

#28 2014-10-10 01:24:37

mrdale
Member
From: Walla Walla
Registered: 2004-11-19
Posts: 2,215
Website

Re: Textpattern moves to Git and GitHub

Sure, just getting used to the idea of git and it’s differences. I do think it’s a minor drawback that I can’t glance at commit and immediately see where it is historically, but I get that it’s better for a distributed workflow.

git log -1 will work tho.

Previously I had used the -r nnnn option with svn to revert from bleeding edge if there were any incompatibility issues, but I agree that feature branches are WAY better.

Offline

Board footer

Powered by FluxBB