Hi Kaloyan
thanks a lot for the corrections to the cvs. We appreciate it very much.
Your decisions for changes are all okay.
Elpidio
Kaloyan Raev wrote:
Hello,
Since Robert Meggle and his team seem to be quite occupied lately, I
decided to give it a try in recovering the broken g2_deployment_2_1
branch. After some fight between me and the cvs, I think I have
success.
So, here is what I did. I used the KDiff3 tool to make 3-way diff
comparison between the official D2.1 full pack release (+ the patch) and
the g2_deployment_2_1 branch in cvs. I added also the elc_tanzania-0-2
branch as an additional decision factor in the diff procedure. Then I
followed some basic rules to merge the full pack release with the
g2_deployment_2_1 branch, like:
* If a file (or change) is present in the full pack release, but is
missing in the g2_deployment branch, then it should be also in the
g2_deployment branch.
* If a file is present in both the full pack and g2_deployment, but is
there are differences, then the help from elc_tanzania branch comes. If
the full pack and elc_tanzania are equal, then the differences should go
also to g2_deployment.
Of course, I didn't follow the above rules just blindly, but in most of
the cases the decision was quite simple and obvious. There were also
cases in which a file was different in all three branches, but these
were almost always due to differences in the identation.
There are several directories that I didn't include in my diff/merge
procedure. They are:
/development/*
/docs/*
/modules/phpmyadmin/*
/modules/phppgadmin/*
There are big differences in these directories and I will spend more
time with them later. I think they do not affect the functionality of
the care2x system.
There are also many files which are present in the g2_deployment_2_1
branch, but are not available in full pack release. I think most of
these files are old version and have to be removed from the repository.
But this is also for later time.
I forked the 'g2_deployment_2_1' branch in cvs. The new branch is called
'g2_deployment_2_1-consistency-branch'. I comitted the merge result in
the new branch. Just before the fork, I marked the 'g2_deployment_2_1'
branch with a tag called 'Root-of-g2_deployment_2_1-consistency'.
I will be happy and thankful if somebody export the
g2_deployment_2_1-consistency-branch from cvs and check if it works as
expected. I made some testing myself and it seems ok, but I do not have
much experience with care2x.
An export from this branch can be also downloaded directly from this
location:
http://debian.fmi.uni-sofia.bg/~raev/care2x/care2x_d21_full-consistency.tar.gz
Any feedback is appreciated :-)
If there is an agreement, when the
'g2_deployment_2_1-consistency-branch' is approved to be stable, I will
merge the changes to the parent 'g2_deployment_2_1' branch.
Greetings
Kaloyan
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Care2002-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/care2002-developers
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Care2002-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/care2002-developers
