Menu
▾
▴
#9 Merge from http://icelan.ru/svn/qicoxe/trunk/
From : Alexander Polozov 2:5025/3.167 18 Apr 15 22:17:36
To : Rj Clay 1:120/544 18 Apr 15 16:37:13
Subj : qico merge
Hello, Robert!
If it posible, merge please a fork the qicoxe from http://icelan.ru/svn/qicoxe/trunk/ into main tree.
It have some patches by Mitry Matyushkov and Semen Panevin placed after qico-0.57.1xe and fixing some errors.
PS: Forgive my poor english
Alexander
Will investigate this but keep in mind that the code is now kept in Git repository, not an SVN repository, and will need to figure out what the changes are.
One change, at least, in the http://icelan.ru/svn/qicoxe/trunk SVN repository that should be imported is revision 48, one titled like the following and dated (in the test git import I currently have) Sat 29 Nov 2014 04:03:48 AM EST.
The SVN commit were posted by 'semik' in the SVN; as that may be 'Semen Panevin', I've started attempting to contact him about a correct email address that I can use for the GIT SVN import.
I have been in contact with Semen Panevin about what to use for his email address in the import from the icelan.ru SVN repository. I will be checking the git-svn import using it and if that works, will see about setting the icelan.ru SVN repository as a remote in the main qico code repository.
Any news with code merging?
As I mentioned elsewhere; real life got in the way of my working much on that. Have you looked at the code? If so, what there can be merged easily?
To be more precise; I was able to get the commits from his SVN repository mreged into a brancn in the GIT repoisitory. He started with an import of v0.57.1xe; I also have that imported and so was able to merge his into a branch of mine that started with that version. I'll check how much further along I got with it after I get my develop PC back out from storage later this month.
Plan to release a merge of that SVN repository with version 0.60.