Re: [PEAR-DEV] PEAR 1.10

Hello Alexey,


> All the commits on master branch show up as done by you now. :]
> https://github.com/pear/pear-core/commits/master

I'm the committer, but not the author. I did not find a way to get
around this after rebasing the commits from github master onto svn
master.


> > So we've got a 1.9 branch now that the last 1.9.5 release was based
> > off, and master that contains all commits to date.
> 
> There is a small problem with 1.9 branch... If I look at its commit
> history at github, it only shows 23 commits
> https://github.com/pear/pear-core/commits/1.9

Yes. A sad state.

> And the first of these (click at your own risk) shows all the files
> in release 1.9.1 as added. And later ones do not look like merges
> either.

They are strange. I tried to convert the svn repo with reposurgeon
which is much better at porting branches and merges, but reposurgeon
already took > 3 days to generate the author map when I killed it.

So we don't get better tags unfortunately.


> > Unfortunately, version 1.9.2 was already off master by some dozen
> > commits. Fixes were ported from and to master in the subsequent
> > 1.9.x releases, but they were never in sync.
> 
> I don't quite understand: were the 1.9.* PEAR releases done from SVN
> source or from Git?

From SVN.

> I don't see any 1.9 branch in SVN:
> http://svn.php.net/viewvc/pear/pear-core/branches/?pathrev=319707
> 
> Where did it come from?

I've created it from the 1.9.5 tag.


> Also I noticed a very unorthodox approach to tags on Helgi's part: he
> e.g. created pear-core/tags/PEAR-1.9.4 from pear-core/tags/PEAR-1.9.3
> and then merged stuff from trunk to the tag (!):
> http://svn.php.net/viewvc/pear/pear-core/tags/PEAR-1.9.4/?view=log&pathrev=319707
> 
> This works with SVN where branches and tags are the same thing, but I
> don't think this will export cleanly to Git...

Yes, that's one of the problems.

Another problem is that the tests are not part of the tags.


> We should probably discard the 1.9 branch, it is too broken. :[
Yep.

> Too many new features, some of them not supported by unit tests...
Yep.

> Looks like PEAR-1.9.1 was the last tag done from trunk without any
> funny stuff afterwards. I'd suggest re-branching from that point on
> master (this time with tests) and re-merging stuff added in
> subsequent releases.

Sounds like a plan.

-- 
Regards/Mit freundlichen Grüßen
Christian Weiske

-=≡ Geeking around in the name of science since 1982 ≡=-

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)

iEYEARECAAYFAlN884AACgkQFMhaCCTq+CNVvgCeJIJCzLQBXqscbKUMbRglhV6q
nWQAoOBLjSxcHW/piRdSC+UJQtZr/1+O
=k6AC
-----END PGP SIGNATURE-----