[Vtigercrm-developers] postgres support in v5
jtk at yahoo.com
Thu Apr 27 12:29:29 PDT 2006
Just to see what an automatic merge would accomplish to bring the 4.2
postgresql support to the trunk, I did a dry run merge. Definitely file
this under 'foolhardy merging that would break the trunk in many ways':
In svn update/merge console output, 'U' indicates clean merge of
changesets, 'C' indicates conflicting lines.
This merge testing is done with a trunk checkout:
Changeset 5306 is the changeset that merged the work from
vtigercrm/branches/4.2_postgresql_integration to the 4.2 branch.
The following files would apparently get clean automatic merges of the
changeset that adds postgresql support to branches/4.2:
$ svn merge --dry-run
grep 'U '
This definitely doesn't mean complete support (in these files) for
postgresql, only that the changesets from the branch would cleanly merge
to the trunk without additional effort.
These (many) other files would have conflict lines added to the source.
This would definitely bring PHP syntax breakage, and require immediate
attention to resolve the conflicts before the code would even run again:
$ svn merge --dry-run
grep 'C '
There are a few skipped files, due to move, rename or removal in trunk.
Again, merging and subsequently resolving these many conflicts would by no
means imply completed postgresql support for the trunk.
However, any approach that brings the trunk and maintained branches closer
together would be a positive thing.
Once vtigercrm-5.0.0 is in production, certainly people will want to
back-port selected features, and forward-port bug fixes during the long
lifecycle of the vtigercrm-4.2.x series. Minimizing diffs between
branches always makes that process easier.
Just FYI. I don't think this merge (except for the 'U' files) would do
any good at this point. Allan can probably move through the trunk codebase
quicker with his method.
Note: svn revert doesn't undo conflict messages AFAICT. If you try this
merge without the --dry-run option, be prepared to check out a fresh trunk
working copy after you are done examining the results.
More information about the vtigercrm-developers