Repo cleanup

[PhrozenByte]

I've cleaned up the repo a little bit:

• master reverted to 1.4.6 - the only additional commit is now in develop
• repo copied to achievo-history with master and develop at 1.4.5; svn branches and tags unchanged; develop (default branch) contains @dalers README.md updates + changes to indicate the historical purpose (like atk-history)
• deleted svn tags and branches - they can be found in achievo-history now; @atkphpframework/team-atk-admins make sure to delete the tags locally (or fork the repo once again) before pushing with --tags!
• atk submodule now uses atkphpframework/atk instead of dalers/atk-6.4.4 - @dalers, you can delete this repo; latest tags were updated appropriately (this is pretty messy, but the only possibility...)

[dalers]

Great work Daniel! I didn't think Achievo was compatible with later atk (6.4.4+), there was a forum post, but I didn't verify myself. Maybe recent bug fixes solved any issues?

Dale

On Apr 25, 2014, at 8:43 AM, Daniel Rudolf [email protected] wrote:

I've cleaned up the repo a little bit:

master reverted to 1.4.6 - the only additional commit is now in develop
repo copied to achievo-history with master and develop at 1.4.5; svn branches and tags unchanged; develop (default branch) contains @dalers README.md updates + changes to indicate the historical purpose (like atk-history)
deleted svn tags and branches - they can be found in achievo-history now; @atkphpframework/team-atk-admins make sure to delete the tags locally (or clone the repo once again) before pushing with --tags!
atk submodule now uses atkphpframework/atk instead of dalers/atk-6.4.4 - @dalers, you can delete this repo; latest tags were updated appropriately (this is pretty messy, but the only possibility...)
—
Reply to this email directly or view it on GitHub.

[dalers]

It seems the atk submodule still references dalers/atk-6.4.4

I tried cloning the master branch (by accident) and then the develop branch, and both times git tried updating the atk/ directory from dalers/atk-6.4.4 (which is now deleted).

from Git Extensions:

"C:\Program Files (x86)\Git\bin\git.exe" clone -v --recurse-submodules --progress --branch develop "[email protected]:dalers/achievo.git" "C:/xampp/htdocs/achievo"
Cloning into 'C:/xampp/htdocs/achievo'...
6073)   �[K
remote: Total 21211 (delta 14676), reused 21209 (delta 14676)�[K
Submodule 'atk' (https://github.com/dalers/atk-6.4.4.git) registered for path 'atk'
Cloning into 'atk'...
fatal: https://github.com/dalers/atk-6.4.4.git/info/refs?service=git-upload-pack not found: did you run git update-server-info on the server?
Clone of 'https://github.com/dalers/atk-6.4.4.git' into submodule path 'atk' failed
Done

[PhrozenByte]

dalers/achievo isn't up to date and still references the old repo; it's impossible to change a submodule reference retroactively. You must update your repo first:

1. Clone without --recurse-submodules
2. Add upstream
3. Pull from upstream
   Your local repo is up to date now, the submodule references atkphpframework/php. Init the submodules and don't forget to push the updates to origin.