19. Oktober 2017 19:58
20. Oktober 2017 10:04
22. Oktober 2017 11:02
Danis hat geschrieben:
... entwickelt sich auch jeden Monat weiter...
22. Oktober 2017 11:42
22. Oktober 2017 12:49
30. Oktober 2017 20:26
30. Oktober 2017 22:01
30. Oktober 2017 22:49
27. November 2017 20:26
EDIT: Some updates after more than half year of coding.
We switched back to git. Since its automatic merge is AWESOME. Just to win the bet I've moved a solution (modified standard objects and new ones) from NAV7CTP3 to NAV7CTP5 in 4 hours. While a team of four developers achieved the same result needing almost three weeks of everyday work.
Git really makes a difference. I believe the same results are possible with other distributed version control systems.
The reason is: Git and other distributed systems save a lot more information during a commit than i.e. TFS and SVN. It is not so important during regular development, but when it comes to merging, all this 'redundant' information from Git makes the difference.
During the merge Git finds the common revision which started a branch and then applies changes from both branches step by step - in the same way as the developer changed the code - to all files in solution.
If the same line was changed in both branches it shows the conflict. If not it just saves the files into the working folder ready for commit.
Here some statistics:
The Total number of files processed in both CTP3 and CTP3 codebases is around four thousand each;
The Total number of the solution's objects merged is 1170;
The Total number of conflicting files is 140;
The rate of successful automatic merge is about 88% (1170 – 140) / 1170 * 100 = 88%;
Most conflicts are changes in the object's versions — trivial;
None-trivial conflicts in about 20 files;
Trivial find and replace was done on all merged objects (to fix RunFormOnRec -> RunPageOnRec, etc.);
The result is a fully importable set of the most recent solution objects based on CTP5;
The Number of compile errors after import is about 50;
Most of these errors relate to changes in standard objects done from CTP3 to CTP5;
The rate of faulting objects is around 4% (50 / 1170 * 100% = 4%);
27. November 2017 21:53
27. November 2017 23:11
28. November 2017 18:47
28. November 2017 19:16
28. November 2017 21:34
28. November 2017 21:48