Description: ------------ The current releases for this package were coming from a branch, not trunk. The move to Github did not bring the branches with it. Please add the branches to the github repo or move the package back to svn.php.net.

I have two commits to package.xml file that need to be put into the branch before other commits get made. I'll attach them.

Duh. XML files can't be attached. Oh well.

PEAR's development model is to work and release in trunk. To avoid confusion of other developers in the future, how about this for a strategy... Blow away the existing github import. In a working dir on a local computer, grab the 0.3 release branch from attic of svn.php.net and import that to git as "master." Then create a git branch named "0.4" (or similar) and import svn "trunk" to that.

Actually, I can probably just diff trunk/0.4 branch without much trouble and make a unified diff.

OK, now I'm confused. /trunk/ and /branches/ are radically different. Here's the SVN logs for both trunk and the 0.3.0 branch. What was the initial state of play? 0.3.0 branch was more current than trunk, and you were applying fixes across both? Revision: 320873 Author: danielc Date: Monday, 12 December 2011 6:20:49 AM Message: Use same dsn setting layout as the branch. ---- Modified : /pear/packages/Tree/trunk/tests/TreeHelper.php Revision: 320813 Author: danielc Date: Saturday, 10 December 2011 10:24:17 AM Message: Add AllTests file. ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/package.xml Modified : /pear/packages/Tree/trunk/package.xml Added : /pear/packages/Tree/branches/Tree_0_3_0/tests/AllTests.php Added : /pear/packages/Tree/trunk/tests/AllTests.php Revision: 320809 Author: danielc Date: Saturday, 10 December 2011 7:25:56 AM Message: Fixed Bug 19119 Only variable references should be returned by reference. ---- Modified : /pear/packages/Tree/trunk/Tree/Tree.php Revision: 320806 Author: danielc Date: Saturday, 10 December 2011 6:07:22 AM Message: Rework tests so they actually run. ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/package.xml Modified : /pear/packages/Tree/trunk/package.xml Modified : /pear/packages/Tree/trunk/tests Added : /pear/packages/Tree/trunk/tests/TreeHelper.php (Copy from path: /pear/packages/Tree/trunk/tests/UnitTest.php, Revision, 320696) Added : /pear/packages/Tree/branches/Tree_0_3_0/tests/TreeHelper.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/tests/UnitTest.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/tests/getElementTest.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/tests/getElement.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/tests/getIdByPathTest.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/tests/getIdByPath.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/tests/getLevelTest.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/tests/getLevel.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/tests/getPathTest.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/tests/getPath.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/tests/moveTest.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/tests/move.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/tests/removeTest.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/tests/remove.php, Revision, 320695) Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/sql.php Added : /pear/packages/Tree/trunk/tests/getElementTest.php (Copy from path: /pear/packages/Tree/trunk/tests/getElement.php, Revision, 320696) Added : /pear/packages/Tree/trunk/tests/getIdByPathTest.php (Copy from path: /pear/packages/Tree/trunk/tests/getIdByPath.php, Revision, 320696) Added : /pear/packages/Tree/trunk/tests/getLevelTest.php (Copy from path: /pear/packages/Tree/trunk/tests/getLevel.php, Revision, 320696) Added : /pear/packages/Tree/trunk/tests/getPathTest.php (Copy from path: /pear/packages/Tree/trunk/tests/getPath.php, Revision, 320696) Added : /pear/packages/Tree/trunk/tests/moveTest.php (Copy from path: /pear/packages/Tree/trunk/tests/move.php, Revision, 320696) Added : /pear/packages/Tree/trunk/tests/removeTest.php (Copy from path: /pear/packages/Tree/trunk/tests/remove.php, Revision, 320696) Deleted : /pear/packages/Tree/branches/Tree_0_3_0/tests/UnitTest.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/tests/getElement.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/tests/getIdByPath.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/tests/getLevel.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/tests/getPath.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/tests/index.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/tests/move.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/tests/remove.php Deleted : /pear/packages/Tree/trunk/tests/UnitTest.php Deleted : /pear/packages/Tree/trunk/tests/getElement.php Deleted : /pear/packages/Tree/trunk/tests/getIdByPath.php Deleted : /pear/packages/Tree/trunk/tests/getLevel.php Deleted : /pear/packages/Tree/trunk/tests/getPath.php Deleted : /pear/packages/Tree/trunk/tests/index.php Deleted : /pear/packages/Tree/trunk/tests/move.php Deleted : /pear/packages/Tree/trunk/tests/remove.php Modified : /pear/packages/Tree/trunk/tests/sql.php Revision: 320684 Author: danielc Date: Friday, 9 December 2011 4:19:16 AM Message: Make test sql files match. ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/sql.php Modified : /pear/packages/Tree/trunk/tests/sql.php Revision: 320622 Author: danielc Date: Thursday, 8 December 2011 10:24:23 AM Message: Skip test if can not connect to database. ---- Modified : /pear/packages/Tree/trunk/tests/UnitTest.php Revision: 320621 Author: danielc Date: Thursday, 8 December 2011 10:18:56 AM Message: Upgrade PHPUnit require statements (Bug #19117). ---- Modified : /pear/packages/Tree/trunk/tests/UnitTest.php Revision: 320814 Author: danielc Date: Saturday, 10 December 2011 11:03:00 AM Message: Commit change log for release 0.3.5. ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/package.xml Revision: 320812 Author: danielc Date: Saturday, 10 December 2011 10:19:34 AM Message: Hard code path for including TreeHelper file. ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/getElementTest.php Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/getIdByPathTest.php Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/getLevelTest.php Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/getPathTest.php Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/moveTest.php Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/removeTest.php Modified : /pear/packages/Tree/trunk/tests/getElementTest.php Modified : /pear/packages/Tree/trunk/tests/getIdByPathTest.php Modified : /pear/packages/Tree/trunk/tests/getLevelTest.php Modified : /pear/packages/Tree/trunk/tests/getPathTest.php Modified : /pear/packages/Tree/trunk/tests/moveTest.php Modified : /pear/packages/Tree/trunk/tests/removeTest.php Revision: 320810 Author: danielc Date: Saturday, 10 December 2011 8:13:57 AM Message: Mark a failing test as incomplete. ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/getElementTest.php Revision: 320808 Author: danielc Date: Saturday, 10 December 2011 7:24:48 AM Message: NOTE: prior commit was actually "Fixed Bug 19119 Only variable references should be returned by reference." ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory.php Revision: 320807 Author: danielc Date: Saturday, 10 December 2011 7:15:04 AM Message: Prepare for 0.3.5 release. ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/package.xml Modified : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory.php Revision: 320703 Author: danielc Date: Friday, 9 December 2011 8:38:40 AM Message: Rearrange files so they are testable. ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/package.xml Modified : /pear/packages/Tree/trunk/package.xml Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory.php, Revision, 320695) Added : /pear/packages/Tree/trunk/Tree Added : /pear/packages/Tree/trunk/Tree/Tree.php (Copy from path: /pear/packages/Tree/trunk/Tree.php, Revision, 320696) Deleted : /pear/packages/Tree/branches/Tree_0_3_0/Common.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/Dynamic Deleted : /pear/packages/Tree/branches/Tree_0_3_0/Error.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/Memory Deleted : /pear/packages/Tree/branches/Tree_0_3_0/Memory.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/OptionsDB.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/OptionsMDB.php Deleted : /pear/packages/Tree/branches/Tree_0_3_0/OptionsMDB2.php Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Common.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Common.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Dynamic Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Dynamic/DBnested.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Dynamic/DBnested.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Dynamic/MDB2nested.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Dynamic/MDB2nested.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Dynamic/MDBnested.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Dynamic/MDBnested.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Error.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Error.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory/Array.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory/Array.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory/DBnested.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory/DBnested.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory/DBsimple.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory/DBsimple.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory/Filesystem.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory/Filesystem.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory/MDB2nested.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory/MDB2nested.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory/MDB2simple.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory/MDB2simple.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory/MDBnested.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory/MDBnested.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory/MDBsimple.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory/MDBsimple.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Memory/XML.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Memory/XML.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/OptionsDB.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/OptionsDB.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/OptionsMDB.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/OptionsMDB.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/OptionsMDB2.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/OptionsMDB2.php, Revision, 320695) Added : /pear/packages/Tree/branches/Tree_0_3_0/Tree/Tree.php (Copy from path: /pear/packages/Tree/branches/Tree_0_3_0/Tree.php, Revision, 320695) Deleted : /pear/packages/Tree/branches/Tree_0_3_0/Tree.php Deleted : /pear/packages/Tree/trunk/Admin Deleted : /pear/packages/Tree/trunk/Dynamic Deleted : /pear/packages/Tree/trunk/Memory Deleted : /pear/packages/Tree/trunk/Memory.php Deleted : /pear/packages/Tree/trunk/Storage Deleted : /pear/packages/Tree/trunk/Storage.php Added : /pear/packages/Tree/trunk/Tree/Admin Added : /pear/packages/Tree/trunk/Tree/Admin/Dynamic Added : /pear/packages/Tree/trunk/Tree/Admin/Dynamic/DBnested.php (Copy from path: /pear/packages/Tree/trunk/Admin/Dynamic/DBnested.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Admin/Dynamic/MDBnested.php (Copy from path: /pear/packages/Tree/trunk/Admin/Dynamic/MDBnested.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Admin/Simple.php (Copy from path: /pear/packages/Tree/trunk/Admin/Simple.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Dynamic Added : /pear/packages/Tree/trunk/Tree/Dynamic/SQLnested.php (Copy from path: /pear/packages/Tree/trunk/Dynamic/SQLnested.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Memory Added : /pear/packages/Tree/trunk/Tree/Memory/Array.php (Copy from path: /pear/packages/Tree/trunk/Memory/Array.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Memory/Filesystem.php (Copy from path: /pear/packages/Tree/trunk/Memory/Filesystem.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Memory/SQLnested.php (Copy from path: /pear/packages/Tree/trunk/Memory/SQLnested.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Memory/SQLsimple.php (Copy from path: /pear/packages/Tree/trunk/Memory/SQLsimple.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Memory/Simple.php (Copy from path: /pear/packages/Tree/trunk/Memory/Simple.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Memory/XML.php (Copy from path: /pear/packages/Tree/trunk/Memory/XML.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Memory.php (Copy from path: /pear/packages/Tree/trunk/Memory.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Storage Added : /pear/packages/Tree/trunk/Tree/Storage/DB.php (Copy from path: /pear/packages/Tree/trunk/Storage/DB.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Storage/MDB.php (Copy from path: /pear/packages/Tree/trunk/Storage/MDB.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Storage/MDB2.php (Copy from path: /pear/packages/Tree/trunk/Storage/MDB2.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Storage/SQL.php (Copy from path: /pear/packages/Tree/trunk/Storage/SQL.php, Revision, 320696) Added : /pear/packages/Tree/trunk/Tree/Storage.php (Copy from path: /pear/packages/Tree/trunk/Storage.php, Revision, 320696) Deleted : /pear/packages/Tree/trunk/Tree.php Revision: 320678 Author: danielc Date: Friday, 9 December 2011 3:23:36 AM Message: Skip test if can not connect to database. ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/UnitTest.php Revision: 320662 Author: danielc Date: Friday, 9 December 2011 1:17:11 AM Message: Upgrade PHPUnit require statements (Bug #19117). ---- Modified : /pear/packages/Tree/branches/Tree_0_3_0 Modified : /pear/packages/Tree/branches/Tree_0_3_0/tests/UnitTest.php

Here's the udiff. https://gist.github.com/1562520

Yeah, exactly. I was stumped by the layout for a while too while trying to fix a small bug. The 0.3.0 branch is stable. Trunk (for 0.4.0) is totally different, and I guess experimental.

And that's why I'm suggesting the 0.3.0 branch become master and trunk become some experimental/development branch.