Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update user manual URL in README.md § Tutorial #1735

Merged
merged 1 commit into from
Jun 27, 2018

Conversation

ferdnyc
Copy link
Contributor

@ferdnyc ferdnyc commented Jun 26, 2018

The previous link ( http://www.openshotusers.com/help/en/ ) leads to a vaguely-shady-looking placeholder page.

The previous link ( http://www.openshotusers.com/help/en/ ) leads to a vaguely-shady-looking placeholder page.
@ferdnyc ferdnyc changed the title Update user manual URL in § Tutorial Update user manual URL in README.md § Tutorial Jun 26, 2018
@peanutbutterandcrackers peanutbutterandcrackers merged commit b90e159 into OpenShot:develop Jun 27, 2018
@peanutbutterandcrackers
Copy link
Contributor

Like @DylanC once said - "Happy to take responsibility for the merge." :)

Thank you, @ferdnyc!

@ferdnyc ferdnyc deleted the patch-1 branch June 27, 2018 02:27
@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jul 2, 2018

Hmm, seems this got left out of 2.4.2.

Only affects the README.md file bundled with the releases, so not a huge deal. Just an observation.

@peanutbutterandcrackers
Copy link
Contributor

uh uh... and same with the master branch. This got left out of there too. One of the cons of git-flow, again? o.O

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jul 2, 2018

uh uh... and same with the master branch. This got left out of there too.

Well, that part's correct w/in the Flow model, as "master only contains released code".

One of the cons of git-flow, again?

Hard to say for certain, but that seems likely.

Quoting from Corey Quinn's "Terrible Ideas in Git" post today...

At its heart, it's very simple, which is why the diagram in so many blog posts inevitably looks something like the one shown in Figure 1.

(That the image in question is the standard Git Flow model diagram is not lost on his audience.)

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jul 2, 2018

One of the cons of git-flow, again?

Hard to say for certain, but that seems likely.

Actually, it's probably more accurate to say that it's a pitfall of Git Flow when used in combination with Github's online-documents model. When the develop branch is the default in Github, it will display the versions of things like README.md from that branch, which sort of implies that they're released (at least to the Github web interface), but actually releasing those changes to the software requires the extra step of further merging them into release branches.

@peanutbutterandcrackers
Copy link
Contributor

Hmm... perhaps this will resolve itself once a release branch has been made from develop and later merged into master... But yeah. git flow is confusing...

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jul 6, 2018

Oh, it'll resolve itself as soon as the next release branch is forked from develop, at that point it will become part of the release source.

The master branch serves no real purpose in Flow, TBH. Its entire function ("master holds all the released code") could be achieved by simply keeping release branches around post-release. Or just by referencing the tagged commit that represents each release. It's like the people who came up with Flow didn't understand that branches are not filesystems, and you don't need to have commits sitting around at the HEAD of a branch in order to access/retain them.

@peanutbutterandcrackers
Copy link
Contributor

I wonder what 'flow' is used for big projects - like GIMP and Linux kernel...

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jul 6, 2018

I wonder what 'flow' is used for big projects - like GIMP and Linux kernel...

HAHAHAHA! If I know the Gimp developers, they're probably keeping their central code repository in CVS, stored on DAT tapes in an old shoebox somewhere.

The kernel, AIUI it's mostly the flow of invective from Linus' mouth when you submit bad patches that keeps people honest, more than any release process.

But, no, the kernel does have a VERY structured, multi-tiered release process, as you'd expect of a project that manages literally millions of lines of code changes per year, from thousands of developers. But it's also completely specific to that effort, and not generally applicable to any other project.

(If you think Git Flow is overcomplicated — and it is, it absolutely is — the kernel devel process is like one of those massive, planetwide bureaucracies sci-fi writers love to imagine humanity evolving towards. ...And kind of proves their point, come to think of it.)

@peanutbutterandcrackers
Copy link
Contributor

GIMP development has moved to gitlab, BTW. :D

Hmm... I see...

I sure hope git flow works well for us. :)

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jul 8, 2018

Yeah, and I was going to say "but they haven't released anything in like a year", but I see that's not true. They finally did get 2.10 out the door. So, good for them!

Still, a look at https://gitlab.gnome.org/GNOME/gimp/branches/all reveals that they don't impose a particularly structured process for managing releases in the tree. Developers create whatever branches they want, do whatever they want in them, and it looks like when they're getting close to a release they fork a branch from master and ready it there. Pretty standard, especially within Gnome projects.

@peanutbutterandcrackers
Copy link
Contributor

They got 2.10.4 out just a few days ago, too, BTW. I really hope 3.0 series will be out soon. 3.2 will bring adjustment layers on the scene too.

Also, they've got this gegl thing (I don't really understand much about these at all) and evidently, it can be used for video processing too. At least a Linear video editor based on it has been made. https://github.com/hodefoting/gedl

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jul 8, 2018

They got 2.10.4 out just a few days ago, too, BTW

That doesn't really count, 2.10.2 and 2.10.4 are scrambly bugfix releases to paper over issues with 2.10.0, the same way we'll hopefully be scrambling to get an OpenShot 2.4.2.1 (at least) out. 2.10.0, which came out two months ago, was the first major release since 2.8 which was six years ago.

And I wouldn't hold your breath for 3.0, since based on the pattern that'll be out in roughly the year 2024. That puts 3.2 at around 2030.

@peanutbutterandcrackers
Copy link
Contributor

Hmm... How about the end of 2018? (I think I saw it somewhere that because 3.0 is just going to be a port to GTK3 and nothing else - but that hasn't really been the case, they're also re-factoring the code - it's going to be out soon after the release of 2.10)

I wonder why Red Hat and Gnome Foundation don't fund GIMP development. It is a gem.

@ferdnyc
Copy link
Contributor Author

ferdnyc commented Jul 10, 2018

*chuckle* Can't wait to find out whether the GTK3 port gets done before or after the release of GTK4.

@peanutbutterandcrackers
Copy link
Contributor

It won't. GTK 4 is almost ready (according to a tweet that I saw a few days earlier).

Oh GIMP, why you disappointing me?
cookie

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants